mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reftable/stack: drop only use of get_locked_file_path()

Browse Source 
We've got a single callsite where we call `get_locked_file_path()`. As
we're about to convert our usage of the lockfile subsystem to instead be
used via a compatibility shim we'd have to implement more logic for this
single callsite. While that would be okay if Git was the only supposed
user of the reftable library, it's a bit more awkward when considering
that we have to reimplement this functionality for every user of the
library eventually.

Refactor the code such that we don't call `get_locked_file_path()`
anymore.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-11-18 16:34:05 +01:00
committed by Junio C Hamano
parent 01e49941d6
commit 6361226b79
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
reftable/stack.c
View File

@ -1493,9 +1493,15 @@ static int stack_compact_range(struct reftable_stack *st,
*/ */
for (i = 0; i < nlocks; i++) { for (i = 0; i < nlocks; i++) {
struct lock_file *table_lock = &table_locks[i]; struct lock_file *table_lock = &table_locks[i];
char *table_path = get_locked_file_path(table_lock); const char *lock_path = get_lock_file_path(table_lock);
unlink(table_path);
reftable_free(table_path); reftable_buf_reset(&table_name);
err = reftable_buf_add(&table_name, lock_path,
strlen(lock_path) - strlen(".lock"));
if (err)
continue;
unlink(table_name.buf);
} }
done: done: