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/runsv.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'runit/runsv.c')

diff --git a/runit/runsv.c b/runit/runsv.c
index 018a80e..03187a8 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -42,26 +42,26 @@ static char *dir;
 
 #define usage() bb_show_usage()
 
-static void fatal2_cannot(char *m1, char *m2)
+static void fatal2_cannot(const char *m1, const char *m2)
 {
 	bb_perror_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
 	/* was exiting 111 */
 }
-static void fatal_cannot(char *m)
+static void fatal_cannot(const char *m)
 {
 	fatal2_cannot(m, "");
 	/* was exiting 111 */
 }
-static void fatal2x_cannot(char *m1, char *m2)
+static void fatal2x_cannot(const char *m1, const char *m2)
 {
 	bb_error_msg_and_die("%s: fatal: cannot %s%s", dir, m1, m2);
 	/* was exiting 111 */
 }
-static void warn_cannot(char *m)
+static void warn_cannot(const char *m)
 {
 	bb_perror_msg("%s: warning: cannot %s", dir, m);
 }
-static void warnx_cannot(char *m)
+static void warnx_cannot(const char *m)
 {
 	bb_error_msg("%s: warning: cannot %s", dir, m);
 }
@@ -280,12 +280,12 @@ static void startservice(struct svdir *s)
 	char *run[2];
 
 	if (s->state == S_FINISH)
-		run[0] = "./finish";
+		run[0] = (char*)"./finish";
 	else {
-		run[0] = "./run";
+		run[0] = (char*)"./run";
 		custom(s, 'u');
 	}
-	run[1] = 0;
+	run[1] = NULL;
 
 	if (s->pid != 0) stopservice(s); /* should never happen */
 	while ((p = fork()) == -1) {
-- 
cgit v1.1