undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename git_config_from_buf to git_config_from_mem

Browse Source 
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>
This commit is contained in:
Lars Schneider 2016-02-19 10:16:00 +01:00 committed by Junio C Hamano
parent a0578e0382
commit 7454ee3c62
3 changed files with 4 additions and 4 deletions

2
cache.h
View File

@ -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);

4
config.c
View File

@ -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;

2
submodule-config.c
View File

@ -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);