aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2016-02-19 10:16:00 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-19 10:08:12 -0800
commit7454ee3c623a6788d91fd3c97af134de33996cfa (patch)
tree50446d7ce6c9e4d6ce887f21f9d4635e4541fa1d
parenta0578e0382f453924fd2df8ea0402b90cd01f826 (diff)
downloadgit-7454ee3c623a6788d91fd3c97af134de33996cfa.tar.gz
git-7454ee3c623a6788d91fd3c97af134de33996cfa.tar.xz
rename git_config_from_buf to git_config_from_mem
This matches the naming used in the index_{fd,mem,...} functions. Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--cache.h2
-rw-r--r--config.c4
-rw-r--r--submodule-config.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/cache.h b/cache.h
index c63fcc113..6679bb4e1 100644
--- a/cache.h
+++ b/cache.h
@@ -1485,7 +1485,7 @@ struct git_config_source {
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 int git_config_from_buf(config_fn_t fn, const char *name,
+extern int git_config_from_mem(config_fn_t fn, const char *name,
const char *buf, size_t len, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
diff --git a/config.c b/config.c
index 86a5eb257..36b0ddba6 100644
--- a/config.c
+++ b/config.c
@@ -1096,7 +1096,7 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
return ret;
}
-int git_config_from_buf(config_fn_t fn, const char *name, const char *buf,
+int git_config_from_mem(config_fn_t fn, const char *name, const char *buf,
size_t len, void *data)
{
struct config_source top;
@@ -1132,7 +1132,7 @@ static int git_config_from_blob_sha1(config_fn_t fn,
return error("reference '%s' does not point to a blob", name);
}
- ret = git_config_from_buf(fn, name, buf, size, data);
+ ret = git_config_from_mem(fn, name, buf, size, data);
free(buf);
return ret;
diff --git a/submodule-config.c b/submodule-config.c
index fe8ceabf3..b85a93795 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -427,7 +427,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
parameter.commit_sha1 = commit_sha1;
parameter.gitmodules_sha1 = sha1;
parameter.overwrite = 0;
- git_config_from_buf(parse_config, rev.buf, config, config_size,
+ git_config_from_mem(parse_config, rev.buf, config, config_size,
&parameter);
free(config);