mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/parse-config-slot'

Browse Source 
Code cleanup.

* jn/parse-config-slot:
  color_parse: do not mention variable name in error message
  pass config slots as pointers instead of offsets
This commit is contained in:
Junio C Hamano
2014-10-20 12:23:48 -07:00
parent b67588d018 f6c5a2968c
commit b946576839
13 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
log-tree.c
View File

@ -56,15 +56,14 @@ static int parse_decorate_color_slot(const char *slot)
return -1;
}
int parse_decorate_color_config(const char *var, const int ofs, const char *value)
int parse_decorate_color_config(const char *var, const char *slot_name, const char *value)
{
int slot = parse_decorate_color_slot(var + ofs);
int slot = parse_decorate_color_slot(slot_name);
if (slot < 0)
return 0;
if (!value)
return config_error_nonbool(var);
color_parse(value, var, decoration_colors[slot]);
return 0;
return color_parse(value, decoration_colors[slot]);
}
/*