summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2016-02-19 09:16:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-19 18:08:12 (GMT)
commit7454ee3c623a6788d91fd3c97af134de33996cfa (patch)
tree50446d7ce6c9e4d6ce887f21f9d4635e4541fa1d /config.c
parenta0578e0382f453924fd2df8ea0402b90cd01f826 (diff)
downloadgit-7454ee3c623a6788d91fd3c97af134de33996cfa.zip
git-7454ee3c623a6788d91fd3c97af134de33996cfa.tar.gz
git-7454ee3c623a6788d91fd3c97af134de33996cfa.tar.bz2
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>
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.c b/config.c
index 86a5eb2..36b0ddb 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;