# [PATCH 2/5] Use a single function to match names against patterns 2 messages from 2009-03-06 to 2009-03-07. Participants: Daniel Barkalow. Thread: https://gitlist.dev/t/18164 ## Daniel Barkalow, 2009-03-06 04:56 Subject: [PATCH 2/5] Use a single function to match names against patterns Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0903052355110.19665%40iabervon.org ``` This will help when the matching changes. Signed-off-by: Daniel Barkalow --- remote.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/remote.c b/remote.c index d7079c6..709300b 100644 --- a/remote.c +++ b/remote.c @@ -719,6 +719,12 @@ int remote_has_url(struct remote *remote, const char *url) return 0; } +static int name_fits_pattern(const char *key, const char *name) +{ + int ret = !prefixcmp(key, name); + return ret; +} + int remote_find_tracking(struct remote *remote, struct refspec *refspec) { int find_src = refspec->src == NULL; @@ -742,7 +748,7 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec) if (!fetch->dst) continue; if (fetch->pattern) { - if (!prefixcmp(needle, key)) { + if (name_fits_pattern(key, needle)) { *result = xmalloc(strlen(value) + strlen(needle) - strlen(key) + 1); @@ -1020,7 +1026,7 @@ static const struct refspec *check_pattern_match(const struct refspec *rs, continue; } - if (rs[i].pattern && !prefixcmp(src->name, rs[i].src)) + if (rs[i].pattern && name_fits_pattern(rs[i].src, src->name)) return rs + i; } if (matching_refs != -1) @@ -1160,7 +1166,7 @@ static struct ref *get_expanded_map(const struct ref *remote_refs, for (ref = remote_refs; ref; ref = ref->next) { if (strchr(ref->name, '^')) continue; /* a dereference item */ - if (!prefixcmp(ref->name, refspec->src)) { + if (name_fits_pattern(refspec->src, ref->name)) { const char *match; struct ref *cpy = copy_ref(ref); match = ref->name + remote_prefix_len; -- 1.6.1.286.gd33a4.dirty ``` ## Daniel Barkalow, 2009-03-07 06:11 Subject: [PATCH v2 2/5] Use a single function to match names against patterns Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0903070104230.19665%40iabervon.org In-Reply-To: ``` This will help when the matching changes. Signed-off-by: Daniel Barkalow --- Improved the function name for its eventual use. remote.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/remote.c b/remote.c index d7079c6..2816723 100644 --- a/remote.c +++ b/remote.c @@ -719,6 +719,12 @@ int remote_has_url(struct remote *remote, const char *url) return 0; } +static int match_name_with_pattern(const char *key, const char *name) +{ + int ret = !prefixcmp(key, name); + return ret; +} + int remote_find_tracking(struct remote *remote, struct refspec *refspec) { int find_src = refspec->src == NULL; @@ -742,7 +748,7 @@ int remote_find_tracking(struct remote *remote, struct refspec *refspec) if (!fetch->dst) continue; if (fetch->pattern) { - if (!prefixcmp(needle, key)) { + if (match_name_with_pattern(key, needle)) { *result = xmalloc(strlen(value) + strlen(needle) - strlen(key) + 1); @@ -1020,7 +1026,7 @@ static const struct refspec *check_pattern_match(const struct refspec *rs, continue; } - if (rs[i].pattern && !prefixcmp(src->name, rs[i].src)) + if (rs[i].pattern && match_name_with_pattern(rs[i].src, src->name)) return rs + i; } if (matching_refs != -1) @@ -1160,7 +1166,7 @@ static struct ref *get_expanded_map(const struct ref *remote_refs, for (ref = remote_refs; ref; ref = ref->next) { if (strchr(ref->name, '^')) continue; /* a dereference item */ - if (!prefixcmp(ref->name, refspec->src)) { + if (match_name_with_pattern(refspec->src, ref->name)) { const char *match; struct ref *cpy = copy_ref(ref); match = ref->name + remote_prefix_len; -- 1.6.1.286.gd33a4.dirty ```