From: Junio C Hamano <gitster@pobox.com>
To: Ben Peart <Ben.Peart@microsoft.com>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>,
"peff\@peff.net" <peff@peff.net>,
"sandals\@crustytoothpaste.net" <sandals@crustytoothpaste.net>,
"stolee\@gmail.com" <stolee@gmail.com>
Subject: Re: [PATCH v2] convert log_ref_write_fd() to use strbuf
Date: Tue, 10 Jul 2018 14:22:30 -0700 [thread overview]
Message-ID: <xmqqefga6b1l.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180710210806.23384-1-benpeart@microsoft.com> (Ben Peart's message of "Tue, 10 Jul 2018 21:08:22 +0000")
Ben Peart <Ben.Peart@microsoft.com> writes:
> diff --git a/refs/files-backend.c b/refs/files-backend.c
> index a9a066dcfb..054306d779 100644
> --- a/refs/files-backend.c
> +++ b/refs/files-backend.c
> @@ -1582,26 +1582,17 @@ static int log_ref_write_fd(int fd, const struct object_id *old_oid,
> const struct object_id *new_oid,
> const char *committer, const char *msg)
> {
> - int msglen, written;
> - unsigned maxlen, len;
> - char *logrec;
> -
> - msglen = msg ? strlen(msg) : 0;
> - maxlen = strlen(committer) + msglen + 100;
> - logrec = xmalloc(maxlen);
> - len = xsnprintf(logrec, maxlen, "%s %s %s\n",
> - oid_to_hex(old_oid),
> - oid_to_hex(new_oid),
> - committer);
> - if (msglen)
> - len += copy_reflog_msg(logrec + len - 1, msg) - 1;
> -
> - written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
> - free(logrec);
> - if (written < 0)
> - return -1;
> + struct strbuf sb = STRBUF_INIT;
> + int ret = 0;
>
> - return 0;
> + strbuf_addf(&sb, "%s %s %s", oid_to_hex(old_oid), oid_to_hex(new_oid), committer);
> + if (msg && *msg)
> + copy_reflog_msg(&sb, msg);
> + strbuf_addch(&sb, '\n');
> + if (write_in_full(fd, sb.buf, sb.len) < 0)
> + ret = -1;
> + strbuf_release(&sb);
> + return ret;
Nicely plugged here. Looks quite sensible.
next prev parent reply other threads:[~2018-07-10 21:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 18:20 [PATCH v1] convert log_ref_write_fd() to use strbuf Ben Peart
2018-07-10 18:45 ` Jeff King
2018-07-10 19:41 ` Junio C Hamano
2018-07-10 20:21 ` Jeff King
2018-07-10 20:57 ` Ben Peart
2018-07-10 21:08 ` [PATCH v2] " Ben Peart
2018-07-10 21:22 ` Junio C Hamano [this message]
2018-07-13 18:12 ` brian m. carlson
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=xmqqefga6b1l.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Ben.Peart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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).