git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Alban Gruin <alban.gruin@gmail.com>, Derrick Stolee <stolee@gmail.com>
Subject: [PATCH 4/5] refs/files-backend: don't peek into `struct lock_file`
Date: Tue,  5 Jan 2021 20:23:49 +0100	[thread overview]
Message-ID: <a3510f3969d26d26ade136b27a7b9dd1d9cc2976.1609874026.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1609874026.git.martin.agren@gmail.com>

Similar to the previous commits, avoid peeking into the `struct
lock_file`. Use the lock file API instead. Note how we obtain the path
to the lock file if `fdopen_lock_file()` failed and that this is not a
problem: as documented in lockfile.h, failure to "fdopen" does not roll
back the lock file and we're free to, e.g., query it for its path.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 refs/files-backend.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/refs/files-backend.c b/refs/files-backend.c
index 04e85e7002..4fdc68810b 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1824,12 +1824,12 @@ static int create_symref_locked(struct files_ref_store *refs,
 
 	if (!fdopen_lock_file(&lock->lk, "w"))
 		return error("unable to fdopen %s: %s",
-			     lock->lk.tempfile->filename.buf, strerror(errno));
+			     get_lock_file_path(&lock->lk), strerror(errno));
 
 	update_symref_reflog(refs, lock, refname, target, logmsg);
 
 	/* no error check; commit_ref will check ferror */
-	fprintf(lock->lk.tempfile->fp, "ref: %s\n", target);
+	fprintf(get_lock_file_fp(&lock->lk), "ref: %s\n", target);
 	if (commit_ref(lock) < 0)
 		return error("unable to write symref for %s: %s", refname,
 			     strerror(errno));
-- 
2.30.0


  parent reply	other threads:[~2021-01-05 19:26 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-05 19:23 [PATCH 0/5] avoid peeking into `struct lock_file` Martin Ågren
2021-01-05 19:23 ` [PATCH 1/5] builtin/gc: don't peek " Martin Ågren
2021-01-05 19:23 ` [PATCH 2/5] commit-graph: " Martin Ågren
2021-01-05 19:23 ` [PATCH 3/5] midx: " Martin Ågren
2021-01-05 19:23 ` Martin Ågren [this message]
2021-01-05 19:23 ` [PATCH 5/5] read-cache: try not to peek into `struct {lock_,temp}file` Martin Ågren
2021-01-06  2:16 ` [PATCH 0/5] avoid peeking into `struct lock_file` Derrick Stolee
2021-01-06 11:55   ` Junio C Hamano
2021-01-06 22:36     ` Junio C Hamano
2021-01-07  2:08       ` Derrick Stolee
2021-01-07  7:55         ` Martin Ågren
2021-01-07  8:19           ` Junio C Hamano
2021-01-07 18:17             ` Martin Ågren

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=a3510f3969d26d26ade136b27a7b9dd1d9cc2976.1609874026.git.martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=alban.gruin@gmail.com \
    --cc=git@vger.kernel.org \
    --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.
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).