From: René Scharfe Date: Tue, 20 Aug 2019 18:49:12 +0000 (+0200) Subject: sha1-name: make sort_ambiguous_oid_array() thread-safe X-Git-Tag: v2.24.0-rc0~147^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7cfcb16b0ebd8294b2158669e55b79445b48fb31;p=thirdparty%2Fgit.git sha1-name: make sort_ambiguous_oid_array() thread-safe 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 Signed-off-by: Junio C Hamano --- diff --git a/sha1-name.c b/sha1-name.c index 728e6f1f61..c99fbb2f8e 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -403,9 +403,9 @@ static int repo_collect_ambiguous(struct repository *r, return collect_ambiguous(oid, data); } -static struct repository *sort_ambiguous_repo; -static int sort_ambiguous(const void *a, const void *b) +static int sort_ambiguous(const void *a, const void *b, void *ctx) { + struct repository *sort_ambiguous_repo = ctx; int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); 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) { - /* mutex will be needed if this code is to be made thread safe */ - sort_ambiguous_repo = r; - QSORT(a->oid, a->nr, sort_ambiguous); - sort_ambiguous_repo = NULL; + QSORT_S(a->oid, a->nr, sort_ambiguous, r); } static enum get_oid_result get_short_oid(struct repository *r,