show-branch: use QSORT
Shorten the code by using QSORT instead of calling qsort(3) directly, as the former determines the element size automatically and checks if there are at least two elements to sort already. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
1b5294de40
commit
7e65c75c31
@ -353,8 +353,7 @@ static int compare_ref_name(const void *a_, const void *b_)
|
|||||||
|
|
||||||
static void sort_ref_range(int bottom, int top)
|
static void sort_ref_range(int bottom, int top)
|
||||||
{
|
{
|
||||||
qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
|
QSORT(ref_name + bottom, top - bottom, compare_ref_name);
|
||||||
compare_ref_name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int append_ref(const char *refname, const struct object_id *oid,
|
static int append_ref(const char *refname, const struct object_id *oid,
|
||||||
@ -540,8 +539,7 @@ static void append_one_rev(const char *av)
|
|||||||
if (saved_matches == ref_name_cnt &&
|
if (saved_matches == ref_name_cnt &&
|
||||||
ref_name_cnt < MAX_REVS)
|
ref_name_cnt < MAX_REVS)
|
||||||
error(_("no matching refs with %s"), av);
|
error(_("no matching refs with %s"), av);
|
||||||
if (saved_matches + 1 < ref_name_cnt)
|
sort_ref_range(saved_matches, ref_name_cnt);
|
||||||
sort_ref_range(saved_matches, ref_name_cnt);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
die("bad sha1 reference %s", av);
|
die("bad sha1 reference %s", av);
|
||||||
|
Loading…
Reference in New Issue
Block a user