From: "René Scharfe" <l.s.r@web.de>
To: Derrick Stolee <stolee@gmail.com>, Johannes Sixt <j6t@kdbg.org>,
Robear Selwans <rwagih.rw@gmail.com>
Cc: git@vger.kernel.org,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [GSoC][RFC][PATCH 1/2] STRBUF_INIT_CONST: a new way to initialize strbuf
Date: Thu, 27 Feb 2020 16:55:08 +0100 [thread overview]
Message-ID: <ef831d8f-7667-3315-ab80-2cb13bb963a1@web.de> (raw)
In-Reply-To: <a94a32f6-a650-4ec7-927e-032e22a23ffe@gmail.com>
Am 27.02.20 um 07:50 schrieb Derrick Stolee:
> On 2/20/2020 1:49 PM, René Scharfe wrote:
>> Subject: [PATCH] commit-graph: use progress title directly
>>
>> merge_commit_graphs() copies the (translated) progress message into a
>> strbuf and passes the copy to start_delayed_progress() at each loop
>> iteration. The latter function takes a string pointer, so let's avoid
>> the detour and hand the string to it directly. That's shorter, simpler
>> and slightly more efficient.
>>
>> Signed-off-by: René Scharfe <l.s.r@web.de>
>> ---
>> commit-graph.c | 8 ++------
>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/commit-graph.c b/commit-graph.c
>> index 656dd647d5..f013a84e29 100644
>> --- a/commit-graph.c
>> +++ b/commit-graph.c
>> @@ -1657,19 +1657,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
>> {
>> struct commit_graph *g = ctx->r->objects->commit_graph;
>> uint32_t current_graph_number = ctx->num_commit_graphs_before;
>> - struct strbuf progress_title = STRBUF_INIT;
>>
>> while (g && current_graph_number >= ctx->num_commit_graphs_after) {
>> current_graph_number--;
>>
>> - if (ctx->report_progress) {
>> - strbuf_addstr(&progress_title, _("Merging commit-graph"));
>> - ctx->progress = start_delayed_progress(progress_title.buf, 0);
>> - }
>> + if (ctx->report_progress)
>> + ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
>>
>> merge_commit_graph(ctx, g);
>> stop_progress(&ctx->progress);
>> - strbuf_release(&progress_title);
>>
>> g = g->base_graph;
>> }
>> --
>
> Not only is this a good change, it no longer leaks memory.
> Thanks!
strbuf_release() frees the allocated memory, so I don't think the code
was leaking before. (It would have with strbuf_reset()).
René
next prev parent reply other threads:[~2020-02-27 15:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 4:18 [GSoC][RFC][PATCH 0/2] STRBUF_INIT_CONST Cover Robear Selwans
2020-02-18 4:18 ` [GSoC][RFC][PATCH 1/2] STRBUF_INIT_CONST: a new way to initialize strbuf Robear Selwans
2020-02-18 6:21 ` Jeff King
2020-02-18 14:19 ` Robear Selwans
2020-02-18 20:33 ` Jeff King
2020-02-19 8:13 ` Johannes Sixt
2020-02-20 18:49 ` René Scharfe
2020-02-21 5:21 ` Robear Selwans
2020-02-27 6:50 ` Derrick Stolee
2020-02-27 15:55 ` René Scharfe [this message]
2020-02-18 4:18 ` [GSoC][RFC][PATCH 2/2] STRBUF_INIT_CONST: Adapting strbuf_* functions Robear Selwans
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=ef831d8f-7667-3315-ab80-2cb13bb963a1@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=peff@peff.net \
--cc=rwagih.rw@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@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).