summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-05-24 18:49:36 -0400
committerJunio C Hamano <gitster@pobox.com>2011-05-24 16:20:48 -0700
commit3ddf0968c2f64a9f9fa6880d9c22d40459c88335 (patch)
tree3c0a3bcbbdd3cb2f9d83b9e6bed3879977b45a64
parentdbdf5854b21852676de6a8baf052147217ce809b (diff)
downloadgit-3ddf0968c2f64a9f9fa6880d9c22d40459c88335.tar.gz
config: make environment parsing routines static
Nobody outside of git_config_from_parameters should need to use the GIT_CONFIG_PARAMETERS parsing functions, so let's make them private. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
-rw-r--r--config.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/cache.h b/cache.h
index 123dd4bb93..45bb36d17f 100644
--- a/cache.h
+++ b/cache.h
@@ -982,8 +982,6 @@ typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern void git_config_push_parameter(const char *text);
-extern int git_config_parse_parameter(const char *text);
-extern int git_config_parse_environment(void);
extern int git_config_from_parameters(config_fn_t fn, void *data);
extern int git_config(config_fn_t fn, void *);
extern int git_config_early(config_fn_t fn, void *, const char *repo_config);
diff --git a/config.c b/config.c
index c431f41c5a..230fe2c0a2 100644
--- a/config.c
+++ b/config.c
@@ -48,7 +48,7 @@ void git_config_push_parameter(const char *text)
strbuf_release(&env);
}
-int git_config_parse_parameter(const char *text)
+static int git_config_parse_parameter(const char *text)
{
struct config_item *ct;
struct strbuf tmp = STRBUF_INIT;
@@ -75,7 +75,7 @@ int git_config_parse_parameter(const char *text)
return 0;
}
-int git_config_parse_environment(void) {
+static int git_config_parse_environment(void) {
const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
char *envw;
const char **argv = NULL;