From e3394fdce79411fd51e20082c0faf7061007bc1c Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 24 Feb 2017 16:07:19 -0500 Subject: parse_config_key: use skip_prefix instead of starts_with This saves us having to repeatedly add in "section_len" (and also avoids walking over the first part of the string multiple times for a strlen() and strrchr()). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- config.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index 617b2e3cf4..a23f260792 100644 --- a/config.c +++ b/config.c @@ -2531,11 +2531,10 @@ int parse_config_key(const char *var, const char **subsection, int *subsection_len, const char **key) { - int section_len = strlen(section); const char *dot; /* Does it start with "section." ? */ - if (!starts_with(var, section) || var[section_len] != '.') + if (!skip_prefix(var, section, &var) || *var != '.') return -1; /* @@ -2547,12 +2546,12 @@ int parse_config_key(const char *var, *key = dot + 1; /* Did we have a subsection at all? */ - if (dot == var + section_len) { + if (dot == var) { *subsection = NULL; *subsection_len = 0; } else { - *subsection = var + section_len + 1; + *subsection = var + 1; *subsection_len = dot - *subsection; } -- cgit v1.2.3 From 48f8d9f7323d0927cd955f129babbf93eda50473 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 24 Feb 2017 16:08:02 -0500 Subject: parse_config_key: allow matching single-level config The parse_config_key() function was introduced to make it easier to match "section.subsection.key" variables. It also handles the simpler "section.key", and the caller is responsible for distinguishing the two from its out-parameters. Most callers who _only_ want "section.key" would just use a strcmp(var, "section.key"), since there is no parsing required. However, they may still use parse_config_key() if their "section" variable isn't a constant (an example of this is in parse_hide_refs_config). Using the parse_config_key is a bit clunky, though: const char *subsection; int subsection_len; const char *key; if (!parse_config_key(var, section, &subsection, &subsection_len, &key) && !subsection) { /* matched! */ } Instead, let's treat a NULL subsection as an indication that the caller does not expect one. That lets us write: const char *key; if (!parse_config_key(var, section, NULL, NULL, &key)) { /* matched! */ } Existing callers should be unaffected, as passing a NULL subsection would currently segfault. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'config.c') diff --git a/config.c b/config.c index a23f260792..fd92738fba 100644 --- a/config.c +++ b/config.c @@ -2547,10 +2547,14 @@ int parse_config_key(const char *var, /* Did we have a subsection at all? */ if (dot == var) { - *subsection = NULL; - *subsection_len = 0; + if (subsection) { + *subsection = NULL; + *subsection_len = 0; + } } else { + if (!subsection) + return -1; *subsection = var + 1; *subsection_len = dot - *subsection; } -- cgit v1.2.3