Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Use qsort() instead of qsort_r() for portability

Browse Source
This commit is contained in:
Bruce Hill 2025-03-27 17:42:17 -04:00
parent a187cca2b8
commit 1147241f18
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/stdlib/arrays.c
View File

@ -247,18 +247,28 @@ public OptionalInt_t Array$first(Array_t arr, Closure_t predicate)
return NONE_INT; return NONE_INT;
} }
static Closure_t _sort_comparison = {.fn=NULL};
int _compare_closure(const void *a, const void *b)
{
typedef int (*comparison_t)(const void*, const void*, void*);
return ((comparison_t)_sort_comparison.fn)(a, b, _sort_comparison.userdata);
}
public void Array$sort(Array_t *arr, Closure_t comparison, int64_t padded_item_size) public void Array$sort(Array_t *arr, Closure_t comparison, int64_t padded_item_size)
{ {
if (arr->data_refcount != 0 || (int64_t)arr->stride != padded_item_size) if (arr->data_refcount != 0 || (int64_t)arr->stride != padded_item_size)
Array$compact(arr, padded_item_size); Array$compact(arr, padded_item_size);
qsort_r(arr->data, (size_t)arr->length, (size_t)padded_item_size, comparison.fn, comparison.userdata); _sort_comparison = comparison;
qsort(arr->data, (size_t)arr->length, (size_t)padded_item_size, _compare_closure);
} }
public Array_t Array$sorted(Array_t arr, Closure_t comparison, int64_t padded_item_size) public Array_t Array$sorted(Array_t arr, Closure_t comparison, int64_t padded_item_size)
{ {
Array$compact(&arr, padded_item_size); Array$compact(&arr, padded_item_size);
qsort_r(arr.data, (size_t)arr.length, (size_t)padded_item_size, comparison.fn, comparison.userdata); _sort_comparison = comparison;
qsort(arr.data, (size_t)arr.length, (size_t)padded_item_size, _compare_closure);
return arr; return arr;
} }