aboutsummaryrefslogtreecommitdiff
path: root/alias.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-05-14 18:46:53 +0100
committerJunio C Hamano <gitster@pobox.com>2008-05-14 12:34:44 -0700
commitef90d6d4208a5130185b04f06e5f90a5f9959fe3 (patch)
tree1bcef191493614c192a6c690c6264ec8157ff8de /alias.c
parent0bdf93cbf0afd568384f237378ba368e751a2f0f (diff)
downloadgit-ef90d6d4208a5130185b04f06e5f90a5f9959fe3.tar.gz
git-ef90d6d4208a5130185b04f06e5f90a5f9959fe3.tar.xz
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>
Diffstat (limited to 'alias.c')
-rw-r--r--alias.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/alias.c b/alias.c
index 116cac87c..995f3e6a0 100644
--- a/alias.c
+++ b/alias.c
@@ -2,7 +2,8 @@
static const char *alias_key;
static char *alias_val;
-static int alias_lookup_cb(const char *k, const char *v)
+
+static int alias_lookup_cb(const char *k, const char *v, void *cb)
{
if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
if (!v)
@@ -17,6 +18,6 @@ char *alias_lookup(const char *alias)
{
alias_key = alias;
alias_val = NULL;
- git_config(alias_lookup_cb);
+ git_config(alias_lookup_cb, NULL);
return alias_val;
}