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>

diff --git a/cache.h b/cache.h
index c63fcc113a6e511a53f0170a07bd5dbbf12cc120..6679bb4e1ad897989fe424de808528bc06cfa52a 100644 (file)
--- 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 *);
 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);
                               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 86a5eb2571fb282a1d7bad9e6d097b2374b550dc..36b0ddba61112a03ae04b41197358bbf26b76b3b 100644 (file)
--- 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;
 }
 
        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;
                        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);
        }
 
                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;
        free(buf);
 
        return ret;

diff --git a/submodule-config.c b/submodule-config.c
index fe8ceabf3009db672d4d2dc5121123961c298212..b85a9379596413af0146b2be72aec9ad9125f1b7 100644 (file)
--- 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;
        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);
 
                        &parameter);
        free(config);