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 5/6] Add "const" qualifier to "char *excludes_file".
Date: Sat, 16 Feb 2008 06:01:59 +0100 [thread overview]
Message-ID: <20080216060159.e74e6948.chriscool@tuxfamily.org> (raw)
Also use "git_config_string" to simplify "config.c" code
where "excludes_file" is set.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
cache.h | 2 +-
config.c | 8 ++------
environment.c | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/cache.h b/cache.h
index 2af1468..cdcabe9 100644
--- a/cache.h
+++ b/cache.h
@@ -656,7 +656,7 @@ extern int pager_in_use(void);
extern int pager_use_color;
extern const char *editor_program;
-extern char *excludes_file;
+extern const char *excludes_file;
/* base85 */
int decode_85(char *dst, const char *line, int linelen);
diff --git a/config.c b/config.c
index 07027de..ad47dc3 100644
--- a/config.c
+++ b/config.c
@@ -446,12 +446,8 @@ int git_default_config(const char *var, const char *value)
if (!strcmp(var, "core.editor"))
return git_config_string(&editor_program, var, value);
- if (!strcmp(var, "core.excludesfile")) {
- if (!value)
- return config_error_nonbool(var);
- excludes_file = xstrdup(value);
- return 0;
- }
+ if (!strcmp(var, "core.excludesfile"))
+ return git_config_string(&excludes_file, var, value);
if (!strcmp(var, "core.whitespace")) {
if (!value)
diff --git a/environment.c b/environment.c
index 9556009..fa36333 100644
--- a/environment.c
+++ b/environment.c
@@ -33,7 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024;
const char *pager_program;
int pager_use_color = 1;
const char *editor_program;
-char *excludes_file;
+const char *excludes_file;
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
--
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=20080216060159.e74e6948.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).