95b567c7 ("use skip_prefix to avoid repeating strings") transformed calls using starts_with() and then skipping the length of the prefix to skip_prefix() calls. In remote.c there are a few calls like: if (starts_with(foo, "bar")) foo += 3 These calls weren't touched by the commit mentioned above, but can benefit from the same treatment to avoid magic numbers. Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx> --- remote.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/remote.c b/remote.c index 02e698a..4b5b576 100644 --- a/remote.c +++ b/remote.c @@ -321,8 +321,7 @@ static int handle_config(const char *key, const char *value, void *cb) const char *subkey; struct remote *remote; struct branch *branch; - if (starts_with(key, "branch.")) { - name = key + 7; + if (skip_prefix(key, "branch.", &name)) { subkey = strrchr(name, '.'); if (!subkey) return 0; @@ -338,9 +337,8 @@ static int handle_config(const char *key, const char *value, void *cb) } return 0; } - if (starts_with(key, "url.")) { + if (skip_prefix(key, "url.", &name)) { struct rewrite *rewrite; - name = key + 4; subkey = strrchr(name, '.'); if (!subkey) return 0; @@ -357,9 +355,8 @@ static int handle_config(const char *key, const char *value, void *cb) } } - if (!starts_with(key, "remote.")) + if (!skip_prefix(key, "remote.", &name)) return 0; - name = key + 7; /* Handle remote.* variables */ if (!strcmp(name, "pushdefault")) -- 2.7.1.410.g6faf27b -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html