ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more -Wall warning fixes from Cristian Ionescu-Idbohrn.

Browse source 
This time it resulted in small code changes:

function                                             old     new   delta
nexpr                                                820     828      +8
tail_main                                           1200    1202      +2
wrapf                                                166     167      +1
parse_mount_options                                  227     209     -18
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/1 up/down: 11/-18)             Total: -7 bytes
This commit is contained in:
Denis Vlasenko 2008-05-13 02:27:31 +00:00
parent c4f12f59cc
commit 77ad97f199
27 changed files with 69 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

14
util-linux/switch_root.c
View file

@ -13,15 +13,15 @@
// Make up for header deficiencies.
#ifndef RAMFS_MAGIC
#define RAMFS_MAGIC 0x858458f6
#define RAMFS_MAGIC ((unsigned)0x858458f6)
#endif
#ifndef TMPFS_MAGIC
#define TMPFS_MAGIC 0x01021994
#define TMPFS_MAGIC ((unsigned)0x01021994)
#endif
#ifndef MS_MOVE
#define MS_MOVE 8192
#define MS_MOVE 8192
#endif
static dev_t rootdev;
@ -91,10 +91,10 @@ int switch_root_main(int argc ATTRIBUTE_UNUSED, char **argv)
// we mean it. (I could make this a CONFIG option, but I would get email
// from all the people who WILL eat their filesystems.)
if (lstat("/init", &st1) || !S_ISREG(st1.st_mode) || statfs("/", &stfs) ||
(stfs.f_type != RAMFS_MAGIC && stfs.f_type != TMPFS_MAGIC) ||
getpid() != 1)
{
if (lstat("/init", &st1) || !S_ISREG(st1.st_mode) || statfs("/", &stfs)
|| (((unsigned)stfs.f_type != RAMFS_MAGIC) && ((unsigned)stfs.f_type != TMPFS_MAGIC))
|| (getpid() != 1)
) {
bb_error_msg_and_die("not rootfs");
}