svn commit: [25566] trunk/busybox: include init

[vda at busybox.net]

Author: vda
Date: 2009-03-07 01:54:24 +0000 (Sat, 07 Mar 2009)
New Revision: 25566

Log:
halt/reboot/poweroff: improve error reporting

function                                             old     new   delta
halt_main                                            207     185     -22



Modified:
   trunk/busybox/include/libbb.h
   trunk/busybox/init/halt.c


Changeset:
Modified: trunk/busybox/include/libbb.h
===================================================================
--- trunk/busybox/include/libbb.h	2009-03-06 22:48:11 UTC (rev 25565)
+++ trunk/busybox/include/libbb.h	2009-03-07 01:54:24 UTC (rev 25566)
@@ -887,7 +887,7 @@
 extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
 extern void bb_simple_perror_msg(const char *s) FAST_FUNC;
 extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
-extern void bb_simple_perror_msg_and_die(const char *s) __attribute__ ((noreturn)) FAST_FUNC;
+extern void bb_simple_perror_msg_and_die(const char *s) NORETURN FAST_FUNC;
 extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
 extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC;
 extern void bb_perror_nomsg_and_die(void) NORETURN FAST_FUNC;

Modified: trunk/busybox/init/halt.c
===================================================================
--- trunk/busybox/init/halt.c	2009-03-06 22:48:11 UTC (rev 25565)
+++ trunk/busybox/init/halt.c	2009-03-07 01:54:24 UTC (rev 25566)
@@ -95,6 +95,6 @@
 		rc = reboot(magic[which]);
 
 	if (rc)
-		bb_error_msg("no");
+		bb_perror_nomsg_and_die();
 	return rc;
 }