From: Bert Wesarg Date: Mon, 22 Jun 2009 22:27:44 GMT Subject: [PATCH v2] builtin-remote: (get_one_entry): use strbuf Message-ID: <1245709664-23611-1-git-send-email-bert.wesarg@googlemail.com> In-Reply-To: <20090622213204.GB19364@coredump.intra.peff.net> Signed-off-by: Bert Wesarg --- v2: - remove assigment indirection - keep old code flow On Mon, Jun 22, 2009 at 23:32, Jeff King wrote: > But that is somewhat nit-picking. As long as the const-warning goes > away, I will be happy enough. > Thanks for the review. I have no objections to your comments and have all incroporated into v2. Thanks, Bert > -Peff builtin-remote.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/builtin-remote.c b/builtin-remote.c index 658d578..2fb76d3 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -1276,15 +1276,14 @@ static int update(int argc, const char **argv) static int get_one_entry(struct remote *remote, void *priv) { struct string_list *list = priv; + struct strbuf url_buf = STRBUF_INIT; const char **url; int i, url_nr; - void **utilp; if (remote->url_nr > 0) { - utilp = &(string_list_append(remote->name, list)->util); - *utilp = xmalloc(strlen(remote->url[0])+strlen(" (fetch)")+1); - strcpy((char *) *utilp, remote->url[0]); - strcat((char *) *utilp, " (fetch)"); + strbuf_addf(&url_buf, "%s (fetch)", remote->url[0]); + string_list_append(remote->name, list)->util = + strbuf_detach(&url_buf, NULL); } else string_list_append(remote->name, list)->util = NULL; if (remote->pushurl_nr) { @@ -1296,10 +1295,9 @@ static int get_one_entry(struct remote *remote, void *priv) } for (i = 0; i < url_nr; i++) { - utilp = &(string_list_append(remote->name, list)->util); - *utilp = xmalloc(strlen(url[i])+strlen(" (push)")+1); - strcpy((char *) *utilp, url[i]); - strcat((char *) *utilp, " (push)"); + strbuf_addf(&url_buf, "%s (push)", url[i]); + string_list_append(remote->name, list)->util = + strbuf_detach(&url_buf, NULL); } return 0; -- tg: (d4b46b0..) bw/remote-v-use-strbuf (depends on: next)