aboutsummaryrefslogtreecommitdiff
path: root/runit/runsv.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-01-29 22:51:58 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-01-29 22:51:58 +0000
commitab2aea44479fd6f519bccd651a37f30e792b7593 (patch)
tree443636e12ffb52db95168013bbda80f78ed49fe6 /runit/runsv.c
parent06c0a71d2315756db874e98bc4f760ca3283b6a6 (diff)
downloadbusybox-w32-ab2aea44479fd6f519bccd651a37f30e792b7593.tar.gz
busybox-w32-ab2aea44479fd6f519bccd651a37f30e792b7593.tar.bz2
busybox-w32-ab2aea44479fd6f519bccd651a37f30e792b7593.zip
preparatory patch for -Wwrite-strings #4
Diffstat (limited to 'runit/runsv.c')
-rw-r--r--runit/runsv.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/runit/runsv.c b/runit/runsv.c
index 018a80eeb..03187a8b7 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -42,26 +42,26 @@ static char *dir;
42 42
43#define usage() bb_show_usage() 43#define usage() bb_show_usage()
44 44
45static void fatal2_cannot(char *m1, char *m2) 45static void fatal2_cannot(const char *m1, const char *m2)
46{ 46{
47 bb_perror_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2); 47 bb_perror_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
48 /* was exiting 111 */ 48 /* was exiting 111 */
49} 49}
50static void fatal_cannot(char *m) 50static void fatal_cannot(const char *m)
51{ 51{
52 fatal2_cannot(m, ""); 52 fatal2_cannot(m, "");
53 /* was exiting 111 */ 53 /* was exiting 111 */
54} 54}
55static void fatal2x_cannot(char *m1, char *m2) 55static void fatal2x_cannot(const char *m1, const char *m2)
56{ 56{
57 bb_error_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2); 57 bb_error_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
58 /* was exiting 111 */ 58 /* was exiting 111 */
59} 59}
60static void warn_cannot(char *m) 60static void warn_cannot(const char *m)
61{ 61{
62 bb_perror_msg("%s: warning: cannot %s", dir, m); 62 bb_perror_msg("%s: warning: cannot %s", dir, m);
63} 63}
64static void warnx_cannot(char *m) 64static void warnx_cannot(const char *m)
65{ 65{
66 bb_error_msg("%s: warning: cannot %s", dir, m); 66 bb_error_msg("%s: warning: cannot %s", dir, m);
67} 67}
@@ -280,12 +280,12 @@ static void startservice(struct svdir *s)
280 char *run[2]; 280 char *run[2];
281 281
282 if (s->state == S_FINISH) 282 if (s->state == S_FINISH)
283 run[0] = "./finish"; 283 run[0] = (char*)"./finish";
284 else { 284 else {
285 run[0] = "./run"; 285 run[0] = (char*)"./run";
286 custom(s, 'u'); 286 custom(s, 'u');
287 } 287 }
288 run[1] = 0; 288 run[1] = NULL;
289 289
290 if (s->pid != 0) stopservice(s); /* should never happen */ 290 if (s->pid != 0) stopservice(s); /* should never happen */
291 while ((p = fork()) == -1) { 291 while ((p = fork()) == -1) {