зеркало из https://github.com/microsoft/git.git
parse_diff_color_slot: drop ofs parameter
This function originally took a whole config variable name
("var") and an offset ("ofs"). It checked "var+ofs" against
each color slot, but reported errors using the whole "var".
However, since 8b8e862
(ignore unknown color configuration,
2009-12-12), it returns -1 rather than printing its own
error, and therefore only cares about var+ofs. We can drop
the ofs parameter and teach its sole caller to derive the
pointer itself.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
cb682f8cfe
Коммит
9e1a5ebe52
20
diff.c
20
diff.c
|
@ -52,23 +52,23 @@ static char diff_colors[][COLOR_MAXLEN] = {
|
|||
GIT_COLOR_NORMAL, /* FUNCINFO */
|
||||
};
|
||||
|
||||
static int parse_diff_color_slot(const char *var, int ofs)
|
||||
static int parse_diff_color_slot(const char *var)
|
||||
{
|
||||
if (!strcasecmp(var+ofs, "plain"))
|
||||
if (!strcasecmp(var, "plain"))
|
||||
return DIFF_PLAIN;
|
||||
if (!strcasecmp(var+ofs, "meta"))
|
||||
if (!strcasecmp(var, "meta"))
|
||||
return DIFF_METAINFO;
|
||||
if (!strcasecmp(var+ofs, "frag"))
|
||||
if (!strcasecmp(var, "frag"))
|
||||
return DIFF_FRAGINFO;
|
||||
if (!strcasecmp(var+ofs, "old"))
|
||||
if (!strcasecmp(var, "old"))
|
||||
return DIFF_FILE_OLD;
|
||||
if (!strcasecmp(var+ofs, "new"))
|
||||
if (!strcasecmp(var, "new"))
|
||||
return DIFF_FILE_NEW;
|
||||
if (!strcasecmp(var+ofs, "commit"))
|
||||
if (!strcasecmp(var, "commit"))
|
||||
return DIFF_COMMIT;
|
||||
if (!strcasecmp(var+ofs, "whitespace"))
|
||||
if (!strcasecmp(var, "whitespace"))
|
||||
return DIFF_WHITESPACE;
|
||||
if (!strcasecmp(var+ofs, "func"))
|
||||
if (!strcasecmp(var, "func"))
|
||||
return DIFF_FUNCINFO;
|
||||
return -1;
|
||||
}
|
||||
|
@ -240,7 +240,7 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
|
|||
return -1;
|
||||
|
||||
if (starts_with(var, "diff.color.") || starts_with(var, "color.diff.")) {
|
||||
int slot = parse_diff_color_slot(var, 11);
|
||||
int slot = parse_diff_color_slot(var + 11);
|
||||
if (slot < 0)
|
||||
return 0;
|
||||
if (!value)
|
||||
|
|
Загрузка…
Ссылка в новой задаче