From: Christian Couder <chriscool@tuxfamily.org>
To: git@vger.kernel.org
Cc: Junio Hamano <junkio@cox.net>,
Pierre Habouzit <madcoder@debian.org>,
Martin Koegler <mkoegler@auto.tuwien.ac.at>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: [PATCH 6/6] diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"
Date: Sat, 16 Feb 2008 06:02:17 +0100 [thread overview]
Message-ID: <20080216060217.c2ed3bb1.chriscool@tuxfamily.org> (raw)
Also use "git_config_string" to simplify code where "cmd" is set.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
diff.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index 5640cbf..173bb61 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);
}
/*
--
1.5.4.1.129.gf12af-dirty
reply other threads:[~2008-02-16 4:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080216060217.c2ed3bb1.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=junkio@cox.net \
--cc=madcoder@debian.org \
--cc=mkoegler@auto.tuwien.ac.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).