diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-20 22:40:29 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-20 22:40:29 +0300 |
commit | 62ce40d9338046a89de5d2bfb6b258872fd366c0 (patch) | |
tree | caec918aacac7203a8d8c25145b412b9fed6a8cc /color.c | |
parent | cb357221a402c55b23bf99ec9f3b361709d45fa7 (diff) | |
parent | f6c5a2968c103621adf6928a29e4895361eaa23b (diff) |
Merge branch 'jn/parse-config-slot' into jk/colors
* jn/parse-config-slot:
color_parse: do not mention variable name in error message
pass config slots as pointers instead of offsets
Diffstat (limited to 'color.c')
-rw-r--r-- | color.c | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -60,13 +60,12 @@ static int parse_attr(const char *name, int len) return -1; } -void color_parse(const char *value, const char *var, char *dst) +int color_parse(const char *value, char *dst) { - color_parse_mem(value, strlen(value), var, dst); + return color_parse_mem(value, strlen(value), dst); } -void color_parse_mem(const char *value, int value_len, const char *var, - char *dst) +int color_parse_mem(const char *value, int value_len, char *dst) { const char *ptr = value; int len = value_len; @@ -76,7 +75,7 @@ void color_parse_mem(const char *value, int value_len, const char *var, if (!strncasecmp(value, "reset", len)) { strcpy(dst, GIT_COLOR_RESET); - return; + return 0; } /* [fg [bg]] [attr]... */ @@ -153,9 +152,9 @@ void color_parse_mem(const char *value, int value_len, const char *var, *dst++ = 'm'; } *dst = 0; - return; + return 0; bad: - die("bad color value '%.*s' for variable '%s'", value_len, value, var); + return error(_("invalid color value: %.*s"), value_len, value); } int git_config_colorbool(const char *var, const char *value) |