X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=var.c;h=f1eb314e899c518b8dea54b4ff8f3923da7b12cf;hb=f3cad0ad82e24966bf7bcc8a47670c54c30e4b18;hp=c20ac919bdbe73c8cd7657d468d2dfbccf6d3aa2;hpb=65ea3b8c6d9517c5d7f2a6c089cc6578c9486114;p=git.git diff --git a/var.c b/var.c index c20ac919b..f1eb314e8 100644 --- a/var.c +++ b/var.c @@ -5,7 +5,7 @@ */ #include "cache.h" -static const char var_usage[] = "git-var [-l | ]"; +static const char var_usage[] = "git var [-l | ]"; struct git_var { const char *name; @@ -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);