From 341154da281916a0cc04ec0d4712296bc3e7e69a Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 3 Jul 2016 12:30:46 +0100 Subject: switch_root: simplify code and reduce indentation [oclint] The if statement in line 162 already ensures value of cfd to be 0 or greater, so the later if is not needed. Signed-off-by: Sami Kerola --- sys-utils/switch_root.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'sys-utils/switch_root.c') diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c index dc55a6d08..6f5468fca 100644 --- a/sys-utils/switch_root.c +++ b/sys-utils/switch_root.c @@ -176,22 +176,21 @@ static int switchroot(const char *newroot) return -1; } - if (cfd >= 0) { - pid = fork(); - if (pid <= 0) { - struct statfs stfs; - if (fstatfs(cfd, &stfs) == 0 && - (F_TYPE_EQUAL(stfs.f_type, STATFS_RAMFS_MAGIC) || - F_TYPE_EQUAL(stfs.f_type, STATFS_TMPFS_MAGIC))) - recursiveRemove(cfd); - else - warn(_("old root filesystem is not an initramfs")); - - if (pid == 0) - exit(EXIT_SUCCESS); - } - close(cfd); + pid = fork(); + if (pid <= 0) { + struct statfs stfs; + + if (fstatfs(cfd, &stfs) == 0 && + (F_TYPE_EQUAL(stfs.f_type, STATFS_RAMFS_MAGIC) || + F_TYPE_EQUAL(stfs.f_type, STATFS_TMPFS_MAGIC))) + recursiveRemove(cfd); + else + warn(_("old root filesystem is not an initramfs")); + if (pid == 0) + exit(EXIT_SUCCESS); } + + close(cfd); return 0; } -- cgit v1.2.3-55-g7522