From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 16 Feb 2008 05:02:17 +0000 (+0100)
Subject: diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
X-Git-Tag: v1.5.4.2~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b20a60d0c0f23384cb4141d75d9a7c90e99c1432;p=git.git

diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"

Also use "git_config_string" to simplify code where "cmd" is set.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index ed41ce418..f082f55bc 100644
--- a/diff.c
+++ b/diff.c
@@ -57,7 +57,7 @@ static int parse_diff_color_slot(const char *var, int ofs)
 static struct ll_diff_driver {
 	const char *name;
 	struct ll_diff_driver *next;
-	char *cmd;
+	const char *cmd;
 } *user_diff, **user_diff_tail;
 
 /*
@@ -86,10 +86,7 @@ static int parse_lldiff_command(const char *var, const char *ep, const char *val
 		user_diff_tail = &(drv->next);
 	}
 
-	if (!value)
-		return config_error_nonbool(var);
-	drv->cmd = xstrdup(value);
-	return 0;
+	return git_config_string(&(drv->cmd), var, value);
 }
 
 /*