diff.c: return pattern entry pointer rather than just the hunk header pattern
This is in preparation for associating a flag with each pattern which will control how the pattern is interpreted. For example, as a basic or extended regular expression. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey committed
Sep 18, 2008 at 17:40 UTC
45e7ca0f0e1042c26d56b578165365c3f70c0121
1 file changed
+28
-27
diff.c
+28
-27
@@ -94,32 +94,35 @@ static int parse_lldiff_command(const char *var, const char *ep, const char *val
94
* to define a customized regexp to find the beginning of a function to
95
* be used for hunk header lines of "diff -p" style output.
96
*/
97
-static struct funcname_pattern {
97
+struct funcname_pattern_entry {
98
char *name;
99
char *pattern;
100
- struct funcname_pattern *next;
100
+};
101
+static struct funcname_pattern_list {
102
+ struct funcname_pattern_list *next;
103
+ struct funcname_pattern_entry e;
104
} *funcname_pattern_list;
105
106
static int parse_funcname_pattern(const char *var, const char *ep, const char *value)
107
{
108
const char *name;
109
int namelen;
107
- struct funcname_pattern *pp;
110
+ struct funcname_pattern_list *pp;
111
112
name = var + 5; /* "diff." */
113
namelen = ep - name;
114
115
for (pp = funcname_pattern_list; pp; pp = pp->next)
113
- if (!strncmp(pp->name, name, namelen) && !pp->name[namelen])
116
+ if (!strncmp(pp->e.name, name, namelen) && !pp->e.name[namelen])
117
break;
118
if (!pp) {
119
pp = xcalloc(1, sizeof(*pp));
117
- pp->name = xmemdupz(name, namelen);
120
+ pp->e.name = xmemdupz(name, namelen);
121
pp->next = funcname_pattern_list;
122
funcname_pattern_list = pp;
123
}
121
- free(pp->pattern);
122
- pp->pattern = xstrdup(value);
124
+ free(pp->e.pattern);
125
+ pp->e.pattern = xstrdup(value);
126
return 0;
127
}
128
@@ -1377,20 +1380,17 @@ int diff_filespec_is_binary(struct diff_filespec *one)
1380
return one->is_binary;
1381
}
1382
1380
-static const char *funcname_pattern(const char *ident)
1383
+static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
1384
{
1382
- struct funcname_pattern *pp;
1385
+ struct funcname_pattern_list *pp;
1386
1387
for (pp = funcname_pattern_list; pp; pp = pp->next)
1385
- if (!strcmp(ident, pp->name))
1386
- return pp->pattern;
1388
+ if (!strcmp(ident, pp->e.name))
1389
+ return &pp->e;
1390
return NULL;
1391
}
1392
1390
-static struct builtin_funcname_pattern {
1391
- const char *name;
1392
- const char *pattern;
1393
-} builtin_funcname_pattern[] = {
1393
+static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
1394
{ "java", "!^[ ]*\\(catch\\|do\\|for\\|if\\|instanceof\\|"
1395
"new\\|return\\|switch\\|throw\\|while\\)\n"
1396
"^[ ]*\\(\\([ ]*"
@@ -1407,9 +1407,10 @@ static struct builtin_funcname_pattern {
1407
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
1408
};
1409
1410
-static const char *diff_funcname_pattern(struct diff_filespec *one)
1410
+static const struct funcname_pattern_entry *diff_funcname_pattern(struct diff_filespec *one)
1411
{
1412
- const char *ident, *pattern;
1412
+ const char *ident;
1413
+ const struct funcname_pattern_entry *pe;
1414
int i;
1415
1416
diff_filespec_check_attr(one);
@@ -1424,9 +1425,9 @@ static const char *diff_funcname_pattern(struct diff_filespec *one)
1425
return funcname_pattern("default");
1426
1427
/* Look up custom "funcname.$ident" regexp from config. */
1427
- pattern = funcname_pattern(ident);
1428
- if (pattern)
1429
- return pattern;
1428
+ pe = funcname_pattern(ident);
1429
+ if (pe)
1430
+ return pe;
1431
1432
/*
1433
* And define built-in fallback patterns here. Note that
@@ -1434,7 +1435,7 @@ static const char *diff_funcname_pattern(struct diff_filespec *one)
1435
*/
1436
for (i = 0; i < ARRAY_SIZE(builtin_funcname_pattern); i++)
1437
if (!strcmp(ident, builtin_funcname_pattern[i].name))
1437
- return builtin_funcname_pattern[i].pattern;
1438
+ return &builtin_funcname_pattern[i];
1439
1440
return NULL;
1441
}
@@ -1512,11 +1513,11 @@ static void builtin_diff(const char *name_a,
1513
xdemitconf_t xecfg;
1514
xdemitcb_t ecb;
1515
struct emit_callback ecbdata;
1515
- const char *funcname_pattern;
1516
+ const struct funcname_pattern_entry *pe;
1517
1517
- funcname_pattern = diff_funcname_pattern(one);
1518
- if (!funcname_pattern)
1519
- funcname_pattern = diff_funcname_pattern(two);
1518
+ pe = diff_funcname_pattern(one);
1519
+ if (!pe)
1520
+ pe = diff_funcname_pattern(two);
1521
1522
memset(&xecfg, 0, sizeof(xecfg));
1523
memset(&ecbdata, 0, sizeof(ecbdata));
@@ -1528,8 +1529,8 @@ static void builtin_diff(const char *name_a,
1529
xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
1530
xecfg.ctxlen = o->context;
1531
xecfg.flags = XDL_EMIT_FUNCNAMES;
1531
- if (funcname_pattern)
1532
- xdiff_set_find_func(&xecfg, funcname_pattern);
1532
+ if (pe)
1533
+ xdiff_set_find_func(&xecfg, pe->pattern);
1534
if (!diffopts)
1535
;
1536
else if (!prefixcmp(diffopts, "--unified="))