[PATCH 7/11] shutdown: Use EXIT_*

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Marek Polacek <mmpolacek@xxxxxxxxx>
---
 login-utils/shutdown.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c
index 172113c..4c73e73 100644
--- a/login-utils/shutdown.c
+++ b/login-utils/shutdown.c
@@ -114,7 +114,7 @@ usage(void)
 {
 	fprintf(stderr,
 		_("Usage: shutdown [-h|-r] [-fqs] [now|hh:ss|+mins]\n"));
-	exit(1);
+	exit(EXIT_FAILURE);
 }

 static void
@@ -132,7 +132,7 @@ int_handler(int sig)
 	unlink(_PATH_NOLOGIN);
 	signal(SIGINT, SIG_DFL);
 	my_puts(_("Shutdown process aborted"));
-	_exit(1);
+	_exit(EXIT_FAILURE);
 }

 static int
@@ -164,7 +164,7 @@ main(int argc, char *argv[])
 	if(setreuid (0, 0)) {
 		fprintf(stderr, _("%s: Only root can shut a system down.\n"),
 			argv[0]);
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 #endif

@@ -258,7 +258,7 @@ main(int argc, char *argv[])
 			if(timeout < 0) {
 				fprintf(stderr, _("That must be tomorrow, "
 					          "can't you wait till then?\n"));
-				exit(1);
+				exit(EXIT_FAILURE);
 			}
 		} else {
 			xstrncpy(message, argv[c], sizeof(message));
@@ -439,7 +439,7 @@ main(int argc, char *argv[])
 		do_halt(halt_action);
 	}
 	/* NOTREACHED */
-	exit(0); /* to quiet gcc */
+	exit(EXIT_SUCCESS); /* to quiet gcc */
 }

 /*** end of main() ***/
@@ -577,7 +577,7 @@ swap_off(void)
 		execlp("swapoff", SWAPOFF_ARGS, NULL);
 		my_puts(_("Cannot exec swapoff, "
 			  "hoping umount will do the trick."));
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 	while ((result = wait(&status)) != -1 && result != pid)
 		;
@@ -608,7 +608,7 @@ unmount_disks(void)

 		execlp("umount", UMOUNT_ARGS, NULL);
 		my_puts(_("Cannot exec umount, giving up on umount."));
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 	while ((result = wait(&status)) != -1 && result != pid)
 		;
-- 
1.7.3.2


--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux