diff options
| author |  René Scharfe <l.s.r@web.de> | 2019-08-20 20:49:12 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-20 13:59:59 -0700 |
| commit | 7cfcb16b0ebd8294b2158669e55b79445b48fb31 (patch) | |
| tree | 2c7f5ffa98348dcda605eebf5fd10cb9d469ad35 /sha1-name.c | |
| parent | Git 2.22.1 (diff) | |
| download | tgif-7cfcb16b0ebd8294b2158669e55b79445b48fb31.tar.xz | |
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 <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-name.c')
| -rw-r--r-- | sha1-name.c | 9 |
1 files changed, 3 insertions, 6 deletions
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, |