undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1-name: make sort_ambiguous_oid_array() thread-safe

Browse Source 
Use QSORT_S instead of QSORT, which allows passing the repository
pointer to the comparison function without using a static variable.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2019-08-20 20:49:12 +02:00 committed by Junio C Hamano
parent 75b2f01a0f
commit 7cfcb16b0e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sha1-name.c
View File

@ -403,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r,
return collect_ambiguous(oid, data); return collect_ambiguous(oid, data);
} }
static struct repository *sort_ambiguous_repo; static int sort_ambiguous(const void *a, const void *b, void *ctx)
static int sort_ambiguous(const void *a, const void *b)
{ {
struct repository *sort_ambiguous_repo = ctx;
int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); int a_type = oid_object_info(sort_ambiguous_repo, a, NULL);
int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); int b_type = oid_object_info(sort_ambiguous_repo, b, NULL);
int a_type_sort; int a_type_sort;
@ -434,10 +434,7 @@ static int sort_ambiguous(const void *a, const void *b)
static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a)
{ {
/* mutex will be needed if this code is to be made thread safe */ QSORT_S(a->oid, a->nr, sort_ambiguous, r);
sort_ambiguous_repo = r;
QSORT(a->oid, a->nr, sort_ambiguous);
sort_ambiguous_repo = NULL;
} }
static enum get_oid_result get_short_oid(struct repository *r, static enum get_oid_result get_short_oid(struct repository *r,