Make some strings const

tihirvon · Junio C Hamano · commit 554fe20d8056 · 2006-06-28T03:24:37.000-07:00
Signed-off-by: Timo Hirvonen &lt;tihirvon@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
@@ -165,7 +165,7 @@ static int handle_subject(char *line)
 
 static int slurp_attr(const char *line, const char *name, char *attr)
 {
-	char *ends, *ap = strcasestr(line, name);
+	const char *ends, *ap = strcasestr(line, name);
 	size_t sz;
 
 	if (!ap) {
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
@@ -329,7 +329,7 @@ int cmd_rev_parse(int argc, const char **argv, char **envp)
 		dotdot = strstr(arg, "..");
 		if (dotdot) {
 			unsigned char end[20];
-			char *next = dotdot + 2;
+			const char *next = dotdot + 2;
 			const char *this = arg;
 			*dotdot = 0;
 			if (!*next)
diff --git a/commit.c b/commit.c
@@ -543,7 +543,7 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
 		const char *hex = abbrev
 			? find_unique_abbrev(p->object.sha1, abbrev)
 			: sha1_to_hex(p->object.sha1);
-		char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
+		const char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";
 		parent = parent->next;
 
 		offset += sprintf(buf + offset, " %s%s", hex, dots);
diff --git a/connect.c b/connect.c
@@ -330,7 +330,7 @@ static int git_tcp_connect_sock(char *host)
 {
 	int sockfd = -1;
 	char *colon, *end;
-	char *port = STR(DEFAULT_GIT_PORT);
+	const char *port = STR(DEFAULT_GIT_PORT);
 	struct addrinfo hints, *ai0, *ai;
 	int gai;
 
@@ -525,7 +525,7 @@ static int git_use_proxy(const char *host)
 static void git_proxy_connect(int fd[2],
 			      const char *prog, char *host, char *path)
 {
-	char *port = STR(DEFAULT_GIT_PORT);
+	const char *port = STR(DEFAULT_GIT_PORT);
 	char *colon, *end;
 	int pipefd[2][2];
 	pid_t pid;
diff --git a/daemon.c b/daemon.c
@@ -35,7 +35,7 @@ static char *base_path = NULL;
  * after ~user/.  E.g. a request to git://host/~alice/frotz would
  * go to /home/alice/pub_git/frotz with --user-path=pub_git.
  */
-static char *user_path = NULL;
+static const char *user_path = NULL;
 
 /* Timeout, and initial timeout */
 static unsigned int timeout = 0;
@@ -472,7 +472,7 @@ static void child_handler(int signo)
 			children_reaped = reaped + 1;
 			/* XXX: Custom logging, since we don't wanna getpid() */
 			if (verbose) {
-				char *dead = "";
+				const char *dead = "";
 				if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
 					dead = " (with error)";
 				if (log_syslog)
diff --git a/describe.c b/describe.c
@@ -97,7 +97,7 @@ static int compare_names(const void *_a, const void *_b)
 	return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
 }
 
-static void describe(char *arg, int last_one)
+static void describe(const char *arg, int last_one)
 {
 	unsigned char sha1[20];
 	struct commit *cmit;
diff --git a/git.c b/git.c
@@ -16,7 +16,8 @@
 
 static void prepend_to_path(const char *dir, int len)
 {
-	char *path, *old_path = getenv("PATH");
+	const char *old_path = getenv("PATH");
+	char *path;
 	int path_len = len;
 
 	if (!old_path)
diff --git a/http-push.c b/http-push.c
@@ -1274,7 +1274,7 @@ xml_cdata(void *userData, const XML_Char *s, int len)
 	strlcpy(ctx->cdata, s, len + 1);
 }
 
-static struct remote_lock *lock_remote(char *path, long timeout)
+static struct remote_lock *lock_remote(const char *path, long timeout)
 {
 	struct active_request_slot *slot;
 	struct slot_results results;
@@ -2130,7 +2130,7 @@ static int remote_exists(const char *path)
 	return -1;
 }
 
-static void fetch_symref(char *path, char **symref, unsigned char *sha1)
+static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
 {
 	char *url;
 	struct buffer buffer;
diff --git a/imap-send.c b/imap-send.c
@@ -242,7 +242,7 @@ socket_read( Socket_t *sock, char *buf, int len )
 }
 
 static int
-socket_write( Socket_t *sock, char *buf, int len )
+socket_write( Socket_t *sock, const char *buf, int len )
 {
 	int n = write( sock->fd, buf, len );
 	if (n != len) {
diff --git a/sha1_file.c b/sha1_file.c
@@ -343,7 +343,7 @@ static void read_info_alternates(const char * relative_base, int depth)
 
 void prepare_alt_odb(void)
 {
-	char *alt;
+	const char *alt;
 
 	alt = getenv(ALTERNATE_DB_ENVIRONMENT);
 	if (!alt) alt = "";
diff --git a/upload-pack.c b/upload-pack.c
@@ -95,8 +95,8 @@ static void create_pack_file(void)
 		int i;
 		int args;
 		const char **argv;
+		const char **p;
 		char *buf;
-		char **p;
 
 		if (create_full_pack) {
 			args = 10;
@@ -441,7 +441,7 @@ static int receive_needs(void)
 
 static int send_ref(const char *refname, const unsigned char *sha1)
 {
-	static char *capabilities = "multi_ack thin-pack side-band";
+	static const char *capabilities = "multi_ack thin-pack side-band";
 	struct object *o = parse_object(sha1);
 
 	if (!o)

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static int handle_subject(char *line)`
`165`	`165`
`166`	`166`	`static int slurp_attr(const char line, const char name, char *attr)`
`167`	`167`	`{`
`168`		`- char ends, ap = strcasestr(line, name);`
	`168`	`+ const char ends, ap = strcasestr(line, name);`
`169`	`169`	`size_t sz;`
`170`	`170`
`171`	`171`	`if (!ap) {`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ static int compare_names(const void _a, const void _b)`
`97`	`97`	`return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;`
`98`	`98`	`}`
`99`	`99`
`100`		`-static void describe(char *arg, int last_one)`
	`100`	`+static void describe(const char *arg, int last_one)`
`101`	`101`	`{`
`102`	`102`	`unsigned char sha1[20];`
`103`	`103`	`struct commit *cmit;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@`
`16`	`16`
`17`	`17`	`static void prepend_to_path(const char *dir, int len)`
`18`	`18`	`{`
`19`		`- char path, old_path = getenv("PATH");`
	`19`	`+ const char *old_path = getenv("PATH");`
	`20`	`+ char *path;`
`20`	`21`	`int path_len = len;`
`21`	`22`
`22`	`23`	`if (!old_path)`
Original file line number	Diff line number	Diff line change
`@@ -1274,7 +1274,7 @@ xml_cdata(void userData, const XML_Char s, int len)`
`1274`	`1274`	`strlcpy(ctx->cdata, s, len + 1);`
`1275`	`1275`	`}`
`1276`	`1276`
`1277`		`-static struct remote_lock lock_remote(char path, long timeout)`
	`1277`	`+static struct remote_lock lock_remote(const char path, long timeout)`
`1278`	`1278`	`{`
`1279`	`1279`	`struct active_request_slot *slot;`
`1280`	`1280`	`struct slot_results results;`
`@@ -2130,7 +2130,7 @@ static int remote_exists(const char *path)`
`2130`	`2130`	`return -1;`
`2131`	`2131`	`}`
`2132`	`2132`
`2133`		`-static void fetch_symref(char path, char symref, unsigned char sha1)`
	`2133`	`+static void fetch_symref(const char path, char symref, unsigned char sha1)`
`2134`	`2134`	`{`
`2135`	`2135`	`char *url;`
`2136`	`2136`	`struct buffer buffer;`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ socket_read( Socket_t sock, char buf, int len )`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`static int`
`245`		`-socket_write( Socket_t sock, char buf, int len )`
	`245`	`+socket_write( Socket_t sock, const char buf, int len )`
`246`	`246`	`{`
`247`	`247`	`int n = write( sock->fd, buf, len );`
`248`	`248`	`if (n != len) {`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ static void read_info_alternates(const char * relative_base, int depth)`
`343`	`343`
`344`	`344`	`void prepare_alt_odb(void)`
`345`	`345`	`{`
`346`		`- char *alt;`
	`346`	`+ const char *alt;`
`347`	`347`
`348`	`348`	`alt = getenv(ALTERNATE_DB_ENVIRONMENT);`
`349`	`349`	`if (!alt) alt = "";`