From 7454ee3c623a6788d91fd3c97af134de33996cfa Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Fri, 19 Feb 2016 10:16:00 +0100 Subject: [PATCH] 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 Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- cache.h | 2 +- config.c | 4 ++-- submodule-config.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cache.h b/cache.h index c63fcc113a..6679bb4e1a 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 86a5eb2571..36b0ddba61 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 fe8ceabf30..b85a937959 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, ¶meter); free(config); -- 2.11.4.GIT