git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com, mhagger@alum.mit.edu,
	peff@peff.net, loic@dachary.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full
Date: Wed, 21 Jan 2015 15:23:42 -0800	[thread overview]
Message-ID: <1421882625-916-4-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1421882625-916-1-git-send-email-sbeller@google.com>

There is another occurrence where we could have used write_str_in_full
(line 3107: write_in_full(lock->lk->fd, &term, 1)), so the current state
is inconsistent. This replaces the only occurrence of write_str_in_full
by write_in_full, so we only need to wrap write_in_full in the next patch.

No functional changes intended.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 refs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/refs.c b/refs.c
index e905f51..8281bed 100644
--- a/refs.c
+++ b/refs.c
@@ -4080,7 +4080,7 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
 		} else if ((flags & EXPIRE_REFLOGS_UPDATE_REF) &&
 			(write_in_full(lock->lk->fd,
 				sha1_to_hex(cb.last_kept_sha1), 40) != 40 ||
-			 write_str_in_full(lock->lk->fd, "\n") != 1 ||
+			 write_in_full(lock->lk->fd, "\n", 1) != 1 ||
 			 close_ref(lock) < 0)) {
 			status |= error("couldn't write %s",
 					lock->lk->filename.buf);
-- 
2.2.1.62.g3f15098

  parent reply	other threads:[~2015-01-21 23:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-21 23:23 [PATCHv1 0/6] Fix bug in large transactions Stefan Beller
2015-01-21 23:23 ` [PATCH 1/6] update-ref: Test handling large transactions properly Stefan Beller
2015-01-21 23:34   ` Jeff King
2015-01-21 23:23 ` [PATCH 2/6] refs.c: remove lock_fd from struct ref_lock Stefan Beller
2015-01-21 23:23 ` Stefan Beller [this message]
2015-01-21 23:38   ` [PATCH 3/6] refs.c: replace write_str_in_full by write_in_full Jeff King
2015-01-21 23:44     ` Stefan Beller
2015-01-21 23:52       ` Jeff King
2015-01-21 23:23 ` [PATCH 4/6] refs.c: Have a write_in_full_to_lock_file wrapping write_in_full Stefan Beller
2015-01-21 23:40   ` Jeff King
2015-01-21 23:23 ` [PATCH 5/6] refs.c: write to a lock file only once Stefan Beller
2015-01-21 23:44   ` Jeff King
2015-01-21 23:23 ` [PATCH 6/6] refs.c: enable large transactions Stefan Beller
2015-01-21 23:47 ` [PATCHv1 0/6] Fix bug in " Jeff King
2015-01-22  8:00   ` Junio C Hamano
2015-01-22 17:52     ` Stefan Beller
2015-01-22 17:58       ` Junio C Hamano
2015-01-22 18:29         ` Stefan Beller

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=1421882625-916-4-git-send-email-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=loic@dachary.org \
    --cc=mhagger@alum.mit.edu \
    --cc=peff@peff.net \
    /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.
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 NNTP newsgroup(s).