diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-20 13:28:22 +0000 |
| commit | e1a0d486e4804eae098571f1a6788394c2ee51ae (patch) | |
| tree | c6f3435738900c8d53832eb919b1b2c3d524f2e5 /init | |
| parent | dd2982882bb192ea757f32514bc2ea0bc96f5ba0 (diff) | |
| download | busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.gz busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.tar.bz2 busybox-w32-e1a0d486e4804eae098571f1a6788394c2ee51ae.zip | |
message string changes, mostly for consistency, also -32 bytes in .rodata
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 2 | ||||
| -rw-r--r-- | init/init.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/init/halt.c b/init/halt.c index 9e3cbb1cf..3ab41f1f2 100644 --- a/init/halt.c +++ b/init/halt.c | |||
| @@ -48,6 +48,6 @@ RB_AUTOBOOT | |||
| 48 | if (rc) rc = kill(1,signals[which]); | 48 | if (rc) rc = kill(1,signals[which]); |
| 49 | } else rc = reboot(magic[which]); | 49 | } else rc = reboot(magic[which]); |
| 50 | 50 | ||
| 51 | if (rc) bb_error_msg("No."); | 51 | if (rc) bb_error_msg("no"); |
| 52 | return rc; | 52 | return rc; |
| 53 | } | 53 | } |
diff --git a/init/init.c b/init/init.c index 99a11e526..beb2b28f0 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -211,7 +211,7 @@ static void message(int device, const char *fmt, ...) | |||
| 211 | if (log_fd < 0) { | 211 | if (log_fd < 0) { |
| 212 | if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) { | 212 | if ((log_fd = device_open(log_console, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) { |
| 213 | log_fd = -2; | 213 | log_fd = -2; |
| 214 | bb_error_msg("Bummer, can't write to log on %s!", log_console); | 214 | bb_error_msg("bummer, can't write to log on %s!", log_console); |
| 215 | device = CONSOLE; | 215 | device = CONSOLE; |
| 216 | } else { | 216 | } else { |
| 217 | fcntl(log_fd, F_SETFD, FD_CLOEXEC); | 217 | fcntl(log_fd, F_SETFD, FD_CLOEXEC); |
| @@ -232,7 +232,7 @@ static void message(int device, const char *fmt, ...) | |||
| 232 | #if ENABLE_DEBUG_INIT | 232 | #if ENABLE_DEBUG_INIT |
| 233 | /* all descriptors may be closed */ | 233 | /* all descriptors may be closed */ |
| 234 | } else { | 234 | } else { |
| 235 | bb_error_msg("Bummer, can't print: "); | 235 | bb_error_msg("bummer, can't print: "); |
| 236 | va_start(arguments, fmt); | 236 | va_start(arguments, fmt); |
| 237 | vfprintf(stderr, fmt, arguments); | 237 | vfprintf(stderr, fmt, arguments); |
| 238 | va_end(arguments); | 238 | va_end(arguments); |