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
8
var.c
8
var.c
@ -39,13 +39,13 @@ static const char *read_var(const char *var)
|
||||
return val;
|
||||
}
|
||||
|
||||
static int show_config(const char *var, const char *value)
|
||||
static int show_config(const char *var, const char *value, void *cb)
|
||||
{
|
||||
if (value)
|
||||
printf("%s=%s\n", var, value);
|
||||
else
|
||||
printf("%s\n", var);
|
||||
return git_default_config(var, value);
|
||||
return git_default_config(var, value, cb);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
@ -60,11 +60,11 @@ int main(int argc, char **argv)
|
||||
val = NULL;
|
||||
|
||||
if (strcmp(argv[1], "-l") == 0) {
|
||||
git_config(show_config);
|
||||
git_config(show_config, NULL);
|
||||
list_vars();
|
||||
return 0;
|
||||
}
|
||||
git_config(git_default_config);
|
||||
git_config(git_default_config, NULL);
|
||||
val = read_var(argv[1]);
|
||||
if (!val)
|
||||
usage(var_usage);
|
||||
|
Reference in New Issue
Block a user