From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: git@vger•kernel.org, jrnieder@gmail•com,
Ronnie Sahlberg <sahlberg@google•com>
Subject: Re: [PATCH v3] refs.c: add a function to append a reflog entry to a fd
Date: Thu, 20 Nov 2014 13:42:34 -0800 [thread overview]
Message-ID: <xmqq4mtt35x1.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1416508657-9057-1-git-send-email-sbeller@google.com> (Stefan Beller's message of "Thu, 20 Nov 2014 10:37:37 -0800")
Stefan Beller <sbeller@google•com> writes:
> From: Ronnie Sahlberg <sahlberg@google•com>
>
> Move code to create the string for a ref and write it to a file descriptor
> from log_ref_write and add it into a new dedicated function
> log_ref_write_fd.
>
> For now the new function is only used from log_ref_write, but later
> on we will call this function from reflog transactions too. That means
> that we will end up with only a single place, where we write a
> reflog entry to a file instead of the current two places
> (log_ref_write and builtin/reflog.c).
>
> Signed-off-by: Ronnie Sahlberg <sahlberg@google•com>
> Signed-off-by: Stefan Beller <sbeller@google•com>
> ---
>
> Changes in version 3:
> * reword the commit message to make it more understandable.
> * no changes in code
> * wait for the follow up to address any changes in the code.
>
> refs.c | 48 ++++++++++++++++++++++++++++++------------------
> 1 file changed, 30 insertions(+), 18 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 5ff457e..9948841 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -2990,15 +2990,37 @@ int log_ref_setup(const char *refname, char *logfile, int bufsize)
> return 0;
> }
>
> +static int log_ref_write_fd(int fd, const unsigned char *old_sha1,
> + const unsigned char *new_sha1,
> + 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 = sprintf(logrec, maxlen, "%s %s %s\n",
You cannot have maxlen here ;-)
> + sha1_to_hex(old_sha1),
> + sha1_to_hex(new_sha1),
> + committer);
> + if (msglen)
> + len += copy_msg(logrec + len - 1, msg) - 1;
> +
> + written = len <= maxlen ? write_in_full(fd, logrec, len) : -1;
> + free(logrec);
> + if (written != len)
> + return -1;
> +
> + return 0;
> +}
> +
> static int log_ref_write(const char *refname, const unsigned char *old_sha1,
> const unsigned char *new_sha1, const char *msg)
> {
> - int logfd, result, written, oflags = O_APPEND | O_WRONLY;
> - unsigned maxlen, len;
> - int msglen;
> + int logfd, result, oflags = O_APPEND | O_WRONLY;
> char log_file[PATH_MAX];
> - char *logrec;
> - const char *committer;
>
> if (log_all_ref_updates < 0)
> log_all_ref_updates = !is_bare_repository();
> @@ -3010,19 +3032,9 @@ static int log_ref_write(const char *refname, const unsigned char *old_sha1,
> logfd = open(log_file, oflags);
> if (logfd < 0)
> return 0;
> - msglen = msg ? strlen(msg) : 0;
> - committer = git_committer_info(0);
> - maxlen = strlen(committer) + msglen + 100;
> - logrec = xmalloc(maxlen);
> - len = sprintf(logrec, "%s %s %s\n",
> - sha1_to_hex(old_sha1),
> - sha1_to_hex(new_sha1),
> - committer);
> - if (msglen)
> - len += copy_msg(logrec + len - 1, msg) - 1;
> - written = len <= maxlen ? write_in_full(logfd, logrec, len) : -1;
> - free(logrec);
> - if (written != len) {
> + result = log_ref_write_fd(logfd, old_sha1, new_sha1,
> + git_committer_info(0), msg);
> + if (result) {
> int save_errno = errno;
> close(logfd);
> error("Unable to append to %s", log_file);
next prev parent reply other threads:[~2014-11-20 21:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 0:42 [PATCH] refs.c: add a function to append a reflog entry to a fd Stefan Beller
2014-11-20 1:22 ` Junio C Hamano
2014-11-20 1:34 ` Junio C Hamano
2014-11-20 2:05 ` Stefan Beller
2014-11-20 2:36 ` Jonathan Nieder
2014-11-20 16:57 ` Junio C Hamano
2014-11-20 18:37 ` [PATCH v3] " Stefan Beller
2014-11-20 21:20 ` Jonathan Nieder
2014-11-20 21:24 ` Stefan Beller
2014-11-20 21:31 ` Jonathan Nieder
2014-11-20 21:42 ` Junio C Hamano [this message]
2014-11-20 21:58 ` Stefan Beller
2014-11-20 22:05 ` Jonathan Nieder
2014-11-20 22:11 ` Junio C Hamano
2014-11-20 21:59 ` [PATCH v4] " Stefan Beller
2014-11-20 22:11 ` Jonathan Nieder
2014-11-20 22:29 ` Junio C Hamano
2014-11-20 1:42 ` [PATCH] " Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4mtt35x1.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=sahlberg@google$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox