path: root/help.c
diff options
authorJohannes Schindelin <>2008-05-14 17:46:53 (GMT)
committerJunio C Hamano <>2008-05-14 19:34:44 (GMT)
commitef90d6d4208a5130185b04f06e5f90a5f9959fe3 (patch)
tree1bcef191493614c192a6c690c6264ec8157ff8de /help.c
parent0bdf93cbf0afd568384f237378ba368e751a2f0f (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'help.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/help.c b/help.c
index af80979..d89d437 100644
--- a/help.c
+++ b/help.c
@@ -252,7 +252,7 @@ static int add_man_viewer_info(const char *var, const char *value)
return 0;
-static int git_help_config(const char *var, const char *value)
+static int git_help_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "help.format")) {
if (!value)
@@ -269,7 +269,7 @@ static int git_help_config(const char *var, const char *value)
if (!prefixcmp(var, "man."))
return add_man_viewer_info(var, value);
- return git_default_config(var, value);
+ return git_default_config(var, value, cb);
/* most GUI terminals set COLUMNS (although some don't export it) */
@@ -641,7 +641,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
const char *alias;
- git_config(git_help_config);
+ git_config(git_help_config, NULL);
argc = parse_options(argc, argv, builtin_help_options,
builtin_help_usage, 0);