reflog: use parse_config_key in config callback
This doesn't save any lines, but does keep us from doing error-prone pointer arithmetic with constants. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jan 23, 2013 at 01:27 UTC
b3873c336cc2eb5a6eb2b10981a2ca0b65b8c987
1 file changed
+7
-6
builtin/reflog.c
+7
-6
@@ -510,26 +510,27 @@ static int parse_expire_cfg_value(const char *var, const char *value, unsigned l
510
511
static int reflog_expire_config(const char *var, const char *value, void *cb)
512
{
513
- const char *lastdot = strrchr(var, '.');
513
+ const char *pattern, *key;
514
+ int pattern_len;
515
unsigned long expire;
516
int slot;
517
struct reflog_expire_cfg *ent;
518
518
- if (!lastdot || prefixcmp(var, "gc."))
519
+ if (parse_config_key(var, "gc", &pattern, &pattern_len, &key) < 0)
520
return git_default_config(var, value, cb);
521
521
- if (!strcmp(lastdot, ".reflogexpire")) {
522
+ if (!strcmp(key, "reflogexpire")) {
523
slot = EXPIRE_TOTAL;
524
if (parse_expire_cfg_value(var, value, &expire))
525
return -1;
525
- } else if (!strcmp(lastdot, ".reflogexpireunreachable")) {
526
+ } else if (!strcmp(key, "reflogexpireunreachable")) {
527
slot = EXPIRE_UNREACH;
528
if (parse_expire_cfg_value(var, value, &expire))
529
return -1;
530
} else
531
return git_default_config(var, value, cb);
532
532
- if (lastdot == var + 2) {
533
+ if (!pattern) {
534
switch (slot) {
535
case EXPIRE_TOTAL:
536
default_reflog_expire = expire;
@@ -541,7 +542,7 @@ static int reflog_expire_config(const char *var, const char *value, void *cb)
542
return 0;
543
}
544
544
- ent = find_cfg_ent(var + 3, lastdot - (var+3));
545
+ ent = find_cfg_ent(pattern, pattern_len);
546
if (!ent)
547
return -1;
548
switch (slot) {