From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] bundle: keep a copy of bundle file name in the in-core bundle header
Date: Wed, 2 Mar 2016 04:01:29 -0500 [thread overview]
Message-ID: <20160302090129.GC30295@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr3ft6a9x.fsf@gitster.mtv.corp.google.com>
On Tue, Mar 01, 2016 at 03:36:26PM -0800, Junio C Hamano wrote:
> This will be necessary when we start reading from a split bundle
> where the header and the thin-pack data live in different files.
>
> The in-core bundle header will read from a file that has the header,
> and will record the path to that file. We would find the name of
> the file that hosts the thin-pack data from the header, and we would
> take that name as relative to the file we read the header from.
Neat. I'm hoping this means you're working on split bundles. :)
> diff --git a/builtin/bundle.c b/builtin/bundle.c
> index 4883a43..e63388d 100644
> --- a/builtin/bundle.c
> +++ b/builtin/bundle.c
> @@ -36,8 +36,9 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
> }
>
> memset(&header, 0, sizeof(header));
> - if (strcmp(cmd, "create") && (bundle_fd =
> - read_bundle_header(bundle_file, &header)) < 0)
> + header.bundle_file = bundle_file;
What are the memory ownership rules for header.bundle_file?
Here you assign from either an argv parameter or a stack buffer, and
here...
> @@ -112,6 +111,8 @@ void release_bundle_header(struct bundle_header *header)
> for (i = 0; i < header->references.nr; i++)
> free(header->references.list[i].name);
> free(header->references.list);
> +
> + free((void *)header->bundle_file);
> }
You free it.
The call in get_refs_from_bundle does do an xstrdup().
Should we have:
void init_bundle_header(struct bundle_header *header, const char *file)
{
memset(header, 0, sizeof(*header));
header.bundle_file = xstrdup(file);
}
to abstract the whole procedure?
-Peff
next prev parent reply other threads:[~2016-03-02 9:01 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 23:35 [PATCH 1/2] bundle: plug resource leak Junio C Hamano
2016-03-01 23:36 ` [PATCH 2/2] bundle: keep a copy of bundle file name in the in-core bundle header Junio C Hamano
2016-03-02 9:01 ` Jeff King [this message]
2016-03-02 18:15 ` Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 0/4] "split bundle" preview Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 1/4] bundle doc: 'verify' is not about verifying the bundle Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 2/4] bundle: plug resource leak Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 3/4] bundle: keep a copy of bundle file name in the in-core bundle header Junio C Hamano
2016-03-02 20:49 ` Jeff King
2016-03-02 20:32 ` [PATCH v2 4/4] bundle v3: the beginning Junio C Hamano
2016-03-03 1:36 ` Duy Nguyen
2016-03-03 2:57 ` Junio C Hamano
2016-03-03 5:15 ` Duy Nguyen
2016-05-20 12:39 ` Christian Couder
2016-05-31 12:43 ` Duy Nguyen
2016-05-31 13:18 ` Christian Couder
2016-06-01 13:37 ` Duy Nguyen
2016-06-07 14:49 ` Christian Couder
2016-06-01 14:00 ` Duy Nguyen
2016-06-07 8:46 ` Christian Couder
2016-06-07 8:53 ` Mike Hommey
2016-06-07 10:22 ` Duy Nguyen
2016-06-07 19:23 ` Junio C Hamano
2016-06-07 20:23 ` Jeff King
2016-06-08 10:44 ` Duy Nguyen
2016-06-08 16:19 ` Jeff King
2016-06-09 8:53 ` Duy Nguyen
2016-06-09 17:23 ` Jeff King
2016-06-08 18:05 ` Junio C Hamano
2016-06-08 19:00 ` Jeff King
2016-05-31 22:23 ` Jeff King
2016-05-31 22:31 ` Jeff King
2016-06-07 13:19 ` Christian Couder
2016-06-07 20:35 ` Jeff King
2016-03-02 8:54 ` [PATCH 1/2] bundle: plug resource leak Jeff King
2016-03-02 9:00 ` Junio C Hamano
2016-03-02 9:02 ` Jeff King
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=20160302090129.GC30295@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).