mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Make jv_sort stable regardless of qsort details.

Browse Source
This commit is contained in:
Stephen Dolan
2016-01-18 10:56:54 +00:00
committed by Nicolas Williams
parent 239c357af0
commit 7835a724d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/jv_aux.c
View File

@ -571,14 +571,15 @@ int jv_cmp(jv a, jv b) {
struct sort_entry {
jv object;
jv key;
int index;
};
static int sort_cmp(const void* pa, const void* pb) {
const struct sort_entry* a = pa;
const struct sort_entry* b = pb;
int r = jv_cmp(jv_copy(a->key), jv_copy(b->key));
// comparing by address if r == 0 makes the sort stable
return r ? r : (int)(a - b);
// comparing by index if r == 0 makes the sort stable
return r ? r : (a->index - b->index);
}
static struct sort_entry* sort_items(jv objects, jv keys) {
@ -590,6 +591,7 @@ static struct sort_entry* sort_items(jv objects, jv keys) {
for (int i=0; i<n; i++) {
entries[i].object = jv_array_get(jv_copy(objects), i);
entries[i].key = jv_array_get(jv_copy(keys), i);
entries[i].index = i;
}
jv_free(objects);
jv_free(keys);