Provide git_config with a callback-data parameter
git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
0bdf93cbf0
commit
ef90d6d420
4
setup.c
4
setup.c
@ -300,7 +300,7 @@ void setup_work_tree(void)
|
||||
|
||||
static int check_repository_format_gently(int *nongit_ok)
|
||||
{
|
||||
git_config(check_repository_format_version);
|
||||
git_config(check_repository_format_version, NULL);
|
||||
if (GIT_REPO_VERSION < repository_format_version) {
|
||||
if (!nongit_ok)
|
||||
die ("Expected git repo version <= %d, found %d",
|
||||
@ -524,7 +524,7 @@ int git_config_perm(const char *var, const char *value)
|
||||
return i & 0666;
|
||||
}
|
||||
|
||||
int check_repository_format_version(const char *var, const char *value)
|
||||
int check_repository_format_version(const char *var, const char *value, void *cb)
|
||||
{
|
||||
if (strcmp(var, "core.repositoryformatversion") == 0)
|
||||
repository_format_version = git_config_int(var, value);
|
||||
|
Reference in New Issue
Block a user