Commit 918a733f authored by David Gibson's avatar David Gibson

asort: Use order module definitions

The asort routine takes a user-supplied comparison function.  Use the
definitions from the new order module to slightly simplify the declaration
and handling of this function.
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 37825438
...@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) ...@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
return 1; return 1;
if (strcmp(argv[1], "depends") == 0) { if (strcmp(argv[1], "depends") == 0) {
printf("ccan/typesafe_cb\n"); printf("ccan/order\n");
return 0; return 0;
} }
if (strcmp(argv[1], "testdepends") == 0) { if (strcmp(argv[1], "testdepends") == 0) {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#ifndef CCAN_ASORT_H #ifndef CCAN_ASORT_H
#define CCAN_ASORT_H #define CCAN_ASORT_H
#include "config.h" #include "config.h"
#include <ccan/typesafe_cb/typesafe_cb.h> #include <ccan/order/order.h>
#include <stdlib.h> #include <stdlib.h>
/** /**
...@@ -20,19 +20,13 @@ ...@@ -20,19 +20,13 @@
*/ */
#define asort(base, num, cmp, ctx) \ #define asort(base, num, cmp, ctx) \
_asort((base), (num), sizeof(*(base)), \ _asort((base), (num), sizeof(*(base)), \
typesafe_cb_cast(int (*)(const void *, const void *, void *), \ total_order_cast((cmp), *(base), (ctx)), (ctx))
int (*)(const __typeof__(*(base)) *, \
const __typeof__(*(base)) *, \
__typeof__(ctx)), \
(cmp)), \
(ctx))
#if HAVE_QSORT_R_PRIVATE_LAST #if HAVE_QSORT_R_PRIVATE_LAST
#define _asort(b, n, s, cmp, ctx) qsort_r(b, n, s, cmp, ctx) #define _asort(b, n, s, cmp, ctx) qsort_r(b, n, s, cmp, ctx)
#else #else
void _asort(void *base, size_t nmemb, size_t size, void _asort(void *base, size_t nmemb, size_t size,
int(*compar)(const void *, const void *, void *), _total_order_cb compar, void *ctx);
void *ctx);
#endif #endif
#endif /* CCAN_ASORT_H */ #endif /* CCAN_ASORT_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment