From ab2aea44479fd6f519bccd651a37f30e792b7593 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 29 Jan 2007 22:51:58 +0000 Subject: preparatory patch for -Wwrite-strings #4 --- runit/svlogd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'runit/svlogd.c') diff --git a/runit/svlogd.c b/runit/svlogd.c index 41a7c860e..59b1e5721 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c @@ -75,7 +75,7 @@ static struct logdir { char match; char matcherr; } *dir; -static unsigned dirn = 0; +static unsigned dirn; #define FATAL "fatal: " #define WARNING "warning: " @@ -83,18 +83,18 @@ static unsigned dirn = 0; #define INFO "info: " #define usage() bb_show_usage() -static void fatalx(char *m0) +static void fatalx(const char *m0) { bb_error_msg_and_die(FATAL"%s", m0); } -static void warn(char *m0) { +static void warn(const char *m0) { bb_perror_msg(WARNING"%s", m0); } -static void warn2(char *m0, char *m1) +static void warn2(const char *m0, const char *m1) { bb_perror_msg(WARNING"%s: %s", m0, m1); } -static void warnx(char *m0, char *m1) +static void warnx(const char *m0, const char *m1) { bb_error_msg(WARNING"%s: %s", m0, m1); } @@ -103,12 +103,12 @@ static void pause_nomem(void) bb_error_msg(PAUSE"out of memory"); sleep(3); } -static void pause1cannot(char *m0) +static void pause1cannot(const char *m0) { bb_perror_msg(PAUSE"cannot %s", m0); sleep(3); } -static void pause2cannot(char *m0, char *m1) +static void pause2cannot(const char *m0, const char *m1) { bb_perror_msg(PAUSE"cannot %s %s", m0, m1); sleep(3); @@ -168,8 +168,8 @@ static unsigned processorstart(struct logdir *ld) bb_perror_msg_and_die(FATAL"cannot %s processor %s", "move filedescriptor for", ld->name); // getenv("SHELL")? - prog[0] = "sh"; - prog[1] = "-c"; + prog[0] = (char*)"sh"; + prog[1] = (char*)"-c"; prog[2] = ld->processor; prog[3] = '\0'; execve("/bin/sh", prog, environ); -- cgit v1.2.3