Skip to content

Commit 7454ee3

Browse files
larsxschneidergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a0578e0 commit 7454ee3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ struct git_config_source {
14851485
typedef int (*config_fn_t)(const char *, const char *, void *);
14861486
extern int git_default_config(const char *, const char *, void *);
14871487
extern int git_config_from_file(config_fn_t fn, const char *, void *);
1488-
extern int git_config_from_buf(config_fn_t fn, const char *name,
1488+
extern int git_config_from_mem(config_fn_t fn, const char *name,
14891489
const char *buf, size_t len, void *data);
14901490
extern void git_config_push_parameter(const char *text);
14911491
extern int git_config_from_parameters(config_fn_t fn, void *data);

config.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
10961096
return ret;
10971097
}
10981098

1099-
int git_config_from_buf(config_fn_t fn, const char *name, const char *buf,
1099+
int git_config_from_mem(config_fn_t fn, const char *name, const char *buf,
11001100
size_t len, void *data)
11011101
{
11021102
struct config_source top;
@@ -1132,7 +1132,7 @@ static int git_config_from_blob_sha1(config_fn_t fn,
11321132
return error("reference '%s' does not point to a blob", name);
11331133
}
11341134

1135-
ret = git_config_from_buf(fn, name, buf, size, data);
1135+
ret = git_config_from_mem(fn, name, buf, size, data);
11361136
free(buf);
11371137

11381138
return ret;

submodule-config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static const struct submodule *config_from(struct submodule_cache *cache,
427427
parameter.commit_sha1 = commit_sha1;
428428
parameter.gitmodules_sha1 = sha1;
429429
parameter.overwrite = 0;
430-
git_config_from_buf(parse_config, rev.buf, config, config_size,
430+
git_config_from_mem(parse_config, rev.buf, config, config_size,
431431
&parameter);
432432
free(config);
433433

0 commit comments

Comments
 (0)