Re: [PATCH 3/5] Use the matching function to generate the match results
- From
Daniel Barkalow <barkalow@iabervon.org>
- Date
- Mar 6, 2009, 17:21 UTC
- Message-ID
- <alpine.LNX.1.00.0903061151130.19665@iabervon.org>
- In-Reply-To
- <7vy6vjt679.fsf@gitster.siamese.dyndns.org>
On Fri, 6 Mar 2009, Junio C Hamano wrote:
Show 10 quoted lines
> Daniel Barkalow <barkalow@iabervon.org> writes: > > > This puts all of the interpretation of the pattern representation in a > > single function for easy manipulation. > > > > Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> > > I think this makes sense, but the helper function is not about "does this > name match the pattern?" boolean anymore, and may want to be renamed to > e.g. map_name_with_pattern().
I'll just make it "match_name_with_pattern" from the beginning, which describes what it does whether or not the later arguments are NULL.
Show 31 quoted lines
> > -static int name_fits_pattern(const char *key, const char *name)
> > +static int name_fits_pattern(const char *key, const char *name,
> > + const char *value, char **result)
> > {
> > - int ret = !prefixcmp(key, name);
> > + size_t klen = strlen(key);
> > + int ret = !strncmp(key, name, klen);
> > + if (ret && value) {
> > + size_t vlen = strlen(value);
> > + *result = xmalloc(vlen +
> > + strlen(name) -
> > + klen + 1);
> > + strcpy(*result, value);
> > + strcpy(*result + vlen, name + klen);
> > + }
>
> > @@ -1080,11 +1085,9 @@ int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail,
> >
> > } else {
> > const char *dst_side = pat->dst ? pat->dst : pat->src;
> > - dst_name = xmalloc(strlen(dst_side) +
> > - strlen(src->name) -
> > - strlen(pat->src) + 2);
> > - strcpy(dst_name, dst_side);
> > - strcat(dst_name, src->name + strlen(pat->src));
> > + if (!name_fits_pattern(pat->src, src->name,
> > + dst_side, &dst_name))
> > + die("Didn't think it matches any more");
> > }
>
> Hmm, we have been overallocating and nobody noticed so far?Probably. I suspect that we're making sure to have room for the '\0's at the end of both the base and the part that matches the star. Looks like it's still how Alex Riesen wrote it, sort of arbitrarily one byte longer than the similar allocation.
-Daniel *This .sig left intentionally blank*