From: Jeff King <peff@peff.net>
To: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: git@vger.kernel.org, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Subject: Re: [PATCH] for-each-ref: remove multiple xstrdup() in get_short_ref()
Date: Tue, 7 Apr 2009 03:44:35 -0400 [thread overview]
Message-ID: <20090407074435.GB7327@coredump.intra.peff.net> (raw)
In-Reply-To: <1239089599-24760-1-git-send-email-bert.wesarg@googlemail.com>
On Tue, Apr 07, 2009 at 09:33:19AM +0200, Bert Wesarg wrote:
> Now that get_short_ref() always return an malloced string, consolidate to
> one xstrcpy() call.
Makes sense to squash in on top of what I have. But I think it actually
is pretty easy to always return a pointer into the existing string
(patch based on current master):
---
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 5cbb4b0..8b24a4a 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -569,7 +569,7 @@ static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
/*
* Shorten the refname to an non-ambiguous form
*/
-static char *get_short_ref(struct refinfo *ref)
+static const char *get_short_ref(const char *ref)
{
int i;
static char **scanf_fmts;
@@ -598,17 +598,17 @@ static char *get_short_ref(struct refinfo *ref)
/* bail out if there are no rules */
if (!nr_rules)
- return ref->refname;
+ return ref;
/* buffer for scanf result, at most ref->refname must fit */
- short_name = xstrdup(ref->refname);
+ short_name = xstrdup(ref);
/* skip first rule, it will always match */
for (i = nr_rules - 1; i > 0 ; --i) {
int j;
int short_name_len;
- if (1 != sscanf(ref->refname, scanf_fmts[i], short_name))
+ if (1 != sscanf(ref, scanf_fmts[i], short_name))
continue;
short_name_len = strlen(short_name);
@@ -637,12 +637,14 @@ static char *get_short_ref(struct refinfo *ref)
* short name is non-ambiguous if all previous rules
* haven't resolved to a valid ref
*/
- if (j == i)
- return short_name;
+ if (j == i) {
+ ref += strlen(ref) - strlen(short_name);
+ break;
+ }
}
free(short_name);
- return ref->refname;
+ return ref;
}
@@ -684,7 +686,7 @@ static void populate_value(struct refinfo *ref)
if (formatp) {
formatp++;
if (!strcmp(formatp, "short"))
- refname = get_short_ref(ref);
+ refname = get_short_ref(ref->refname);
else
die("unknown refname format %s",
formatp);
next prev parent reply other threads:[~2009-04-07 7:46 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 7:02 [RFC/PATCH 0/5] making upstream branch information accessible Jeff King
2009-04-07 7:05 ` [PATCH 1/5] for-each-ref: refactor get_short_ref function Jeff King
2009-04-07 7:06 ` [PATCH 2/5] for-each-ref: refactor refname handling Jeff King
2009-04-08 6:22 ` Junio C Hamano
2009-04-08 6:27 ` Jeff King
2009-04-07 7:09 ` [PATCH 3/5] for-each-ref: add "upstream" format field Jeff King
2009-04-07 7:14 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:39 ` Bert Wesarg
2009-04-09 8:18 ` Jeff King
2009-04-09 9:05 ` Bert Wesarg
2009-04-11 17:14 ` [PATCH&RFC] get_short_ref(): add strict mode Bert Wesarg
2009-04-11 19:23 ` Junio C Hamano
2009-04-11 19:50 ` Bert Wesarg
2009-04-11 20:35 ` [PATCH] for-each-ref: refname:short utilize core.warnAmbiguousRefs Bert Wesarg
2009-04-13 8:15 ` [PATCH 4/5] make get_short_ref a public function Jeff King
2009-04-07 7:57 ` Michael J Gruber
2009-04-07 7:16 ` [PATCH 5/5] branch: show upstream branch when double verbose Jeff King
2009-04-07 8:02 ` Michael J Gruber
2009-04-09 8:23 ` Jeff King
2009-04-09 10:15 ` Santi Béjar
2009-04-13 8:34 ` Jeff King
2009-04-13 17:04 ` Wincent Colaiuta
2009-04-07 8:12 ` Paolo Ciarrocchi
2009-04-07 7:33 ` [PATCH] for-each-ref: remove multiple xstrdup() in get_short_ref() Bert Wesarg
2009-04-07 7:44 ` Jeff King [this message]
2009-04-07 7:54 ` Bert Wesarg
2009-04-07 21:41 ` Jeff King
2009-04-07 7:44 ` Bert Wesarg
-- strict thread matches above, loose matches on Subject: below --
2008-09-22 9:09 [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format Bert Wesarg
2008-09-22 9:09 ` [PATCH 2/3] for-each-ref: factor out get_short_ref() into refs.c:abbreviate_refname() Bert Wesarg
2008-09-22 9:09 ` [PATCH 3/3] git abbref-ref: new porcelain for abbreviate_ref() Bert Wesarg
2008-09-22 15:32 ` Shawn O. Pearce
2008-09-22 15:55 ` Junio C Hamano
2008-09-22 16:45 ` Bert Wesarg
2008-09-22 16:43 ` Bert Wesarg
2008-09-22 16:27 ` [PATCH 1/3] for-each-ref: utilize core.warnambiguousrefs for strict refname:short format Junio C Hamano
2008-09-22 18:00 ` Bert Wesarg
2008-10-17 23:58 ` Junio C Hamano
2008-10-18 1:50 ` Shawn O. Pearce
2008-10-18 6:55 ` Bert Wesarg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090407074435.GB7327@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=paolo.ciarrocchi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).