diff options
| author | René Scharfe <l.s.r@web.de> | 2016-09-29 15:27:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 22:42:18 (GMT) |
| commit | 9ed0d8d6e6de7737fe9a658446318b86e57c6fad (patch) | |
| tree | 82fdefc7bd543c99091f5b634947360f75100deb /builtin/pack-objects.c | |
| parent | dbc540c7a5827529a3f58befc9e5b81a31ec8fab (diff) | |
| download | git-9ed0d8d6e6de7737fe9a658446318b86e57c6fad.zip git-9ed0d8d6e6de7737fe9a658446318b86e57c6fad.tar.gz git-9ed0d8d6e6de7737fe9a658446318b86e57c6fad.tar.bz2 | |
use QSORT
Apply the semantic patch contrib/coccinelle/qsort.cocci to the code
base, replacing calls of qsort(3) with QSORT. The resulting code is
shorter and supports empty arrays with NULL pointers.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 166e52c..8aeba6a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1535,7 +1535,7 @@ static void get_object_details(void) sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *)); for (i = 0; i < to_pack.nr_objects; i++) sorted_by_offset[i] = to_pack.objects + i; - qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort); + QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort); for (i = 0; i < to_pack.nr_objects; i++) { struct object_entry *entry = sorted_by_offset[i]; @@ -2257,7 +2257,7 @@ static void prepare_pack(int window, int depth) if (progress) progress_state = start_progress(_("Compressing objects"), nr_deltas); - qsort(delta_list, n, sizeof(*delta_list), type_size_sort); + QSORT(delta_list, n, type_size_sort); ll_find_deltas(delta_list, n, window+1, depth, &nr_done); stop_progress(&progress_state); if (nr_done != nr_deltas) @@ -2449,8 +2449,7 @@ static void add_objects_in_unpacked_packs(struct rev_info *revs) } if (in_pack.nr) { - qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]), - ofscmp); + QSORT(in_pack.array, in_pack.nr, ofscmp); for (i = 0; i < in_pack.nr; i++) { struct object *o = in_pack.array[i].object; add_object_entry(o->oid.hash, o->type, "", 0); |