[PATCH 1/5] builtin/gc: don't peek into `struct lock_file`
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Jan 5, 2021, 19:23 UTC
- Message-ID
- <bbf24f7677eed41b80562d153b35be314cfb2750.1609874026.git.martin.agren@gmail.com>
- In-Reply-To
- <cover.1609874026.git.martin.agren@gmail.com>
A `struct lock_file` is pretty much just a wrapper around a tempfile. But it's easy enough to avoid relying on this. Use the wrappers that the lock file API provides rather than peeking at the temp file or even into *its* internals.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- builtin/gc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/gc.c b/builtin/gc.c index 4c24f41852..64f2b52d6e 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -92,7 +92,7 @@ static void process_log_file(void) */ int saved_errno = errno; fprintf(stderr, _("Failed to fstat %s: %s"), - get_tempfile_path(log_lock.tempfile), + get_lock_file_path(&log_lock), strerror(saved_errno)); fflush(stderr); commit_lock_file(&log_lock); @@ -1518,7 +1518,7 @@ static int update_background_schedule(int run_maintenance) strvec_split(&crontab_list.args, crontab_name); strvec_push(&crontab_list.args, "-l"); crontab_list.in = -1; - crontab_list.out = dup(lk.tempfile->fd); + crontab_list.out = dup(get_lock_file_fd(&lk)); crontab_list.git_cmd = 0; if (start_command(&crontab_list)) { @@ -1533,7 +1533,7 @@ static int update_background_schedule(int run_maintenance) * Read from the .lock file, filtering out the old * schedule while appending the new schedule. */ - cron_list = fdopen(lk.tempfile->fd, "r"); + cron_list = fdopen(get_lock_file_fd(&lk), "r"); rewind(cron_list); strvec_split(&crontab_edit.args, crontab_name);
-- 2.30.0