experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config check for qsort_s/qsort_r

Browse source
This commit is contained in:
Olof hagsand 2024-10-25 19:24:37 +02:00
parent 0b78c9ded0
commit 582bf3feb1
4 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/src/clixon_xml_sort.c
View file

@ -41,7 +41,7 @@
#endif
#include <stdio.h>
#define __USE_GNU /* for qsort_r */
#define __USE_GNU /* for qsort_r or qsort_s */
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
@ -434,7 +434,11 @@ xml_sort_by(cxobj *x,
char *indexvar)
{
xml_enumerate_children(x); /* This is to make sorting "stable", ie not change existing order */
#ifdef HAVE_QSORT_S
qsort_s(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp_qsort, indexvar);
#else
qsort_r(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp_qsort, indexvar);
#endif
return 0;
}
@ -459,7 +463,11 @@ xml_sort(cxobj *x)
return 1;
#endif
xml_enumerate_children(x); /* This is to make sorting "stable", ie not change existing order */
#ifdef HAVE_QSORT_S
qsort_s(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp_qsort, NULL);
#else
qsort_r(xml_childvec_get(x), xml_child_nr(x), sizeof(cxobj *), xml_cmp_qsort, NULL);
#endif
return 0;
}