ilog: credit Tim Terriberry as author in ccan/ilog/_info

[ccan] / ccan / asearch / asearch.h

diff --git a/ccan/asearch/asearch.h b/ccan/asearch/asearch.h
index 2c28ab1c1d89d5f6956f7a0e417f1ca1e15be364..d252284e7d845b19070921868dbdbf45adabb60b 100644 (file)
--- a/ccan/asearch/asearch.h
+++ b/ccan/asearch/asearch.h
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>
 
 #include <stdlib.h>
 #include <ccan/typesafe_cb/typesafe_cb.h>
 

-/*
+/**

  * asearch - search an array of elements
  * @key: pointer to item being searched for
  * @base: pointer to data to sort
  * asearch - search an array of elements
  * @key: pointer to item being searched for
  * @base: pointer to data to sort


@@ -23,10 +23,11 @@
 #if HAVE_TYPEOF
 #define asearch(key, base, num, cmp)                                   \
        ((__typeof__(*(base))*)(bsearch((key), (base), (num), sizeof(*(base)), \
 #if HAVE_TYPEOF
 #define asearch(key, base, num, cmp)                                   \
        ((__typeof__(*(base))*)(bsearch((key), (base), (num), sizeof(*(base)), \

-            cast_if_type((cmp),                                        \
-                         int (*)(const __typeof__(*(key)) *,           \
-                                 const __typeof__(*(base)) *),         \
-                         int (*)(const void *, const void *)))))
+               typesafe_cb_cast(int (*)(const void *, const void *),   \
+                                int (*)(const __typeof__(*(key)) *,    \
+                                        const __typeof__(*(base)) *),  \
+                                (cmp)))))
+

 #else
 #define asearch(key, base, num, cmp)                           \
        (bsearch((key), (base), (num), sizeof(*(base)),         \
 #else
 #define asearch(key, base, num, cmp)                           \
        (bsearch((key), (base), (num), sizeof(*(base)),         \