lib/search/: Simplify CMP()

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/lib/search/cmp/cmp.h b/lib/search/cmp/cmp.h
index 2f8822119517a7c2f0d62a0ea930c748f0ade4c8..49443f6738ec93b8755b9c6cafec36b79912e7e8 100644 (file)
--- a/lib/search/cmp/cmp.h
+++ b/lib/search/cmp/cmp.h
@@ -12,10 +12,10 @@
 #define CMP(T)                                                        \
 (                                                                     \
        _Generic((T) 0,                                               \
-               int *:            cmp_int,                            \
-               long *:           cmp_long,                           \
-               unsigned int *:   cmp_uint,                           \
-               unsigned long *:  cmp_ulong                           \
+               int:            cmp_int,                              \
+               long:           cmp_long,                             \
+               unsigned int:   cmp_uint,                             \
+               unsigned long:  cmp_ulong                             \
        )                                                             \
 )
 

diff --git a/lib/search/l/lfind.h b/lib/search/l/lfind.h
index eb102dc55f53e71e9dbb27854681179dbaded3fd..acc61ae4c27bcce5a4c312e0891f7646330dd772 100644 (file)
--- a/lib/search/l/lfind.h
+++ b/lib/search/l/lfind.h
@@ -18,7 +18,7 @@
 ({                                                                    \
        _Generic(k, T *: 0, const T *: 0);                            \
        _Generic(a, T *: 0, const T *: 0);                            \
-       (T *) lfind_(k, a, n, sizeof(T), CMP(T *));                   \
+       (T *) lfind_(k, a, n, sizeof(T), CMP(T));                     \
 })
 
 

diff --git a/lib/search/l/lsearch.h b/lib/search/l/lsearch.h
index 6f00f3bb12cc5204e578a3947327f836f7d3d4b2..57306a517d0ea8e9b6d1f8f9725fbc13778fcbe3 100644 (file)
--- a/lib/search/l/lsearch.h
+++ b/lib/search/l/lsearch.h
@@ -17,7 +17,7 @@
 ({                                                                    \
        _Generic(k, T *: 0, const T *: 0);                            \
        _Generic(a, T *: 0);                                          \
-       (T *) lsearch(k, a, n, sizeof(T), CMP(T *));                  \
+       (T *) lsearch(k, a, n, sizeof(T), CMP(T));                    \
 })
 
 

diff --git a/lib/search/sort/qsort.h b/lib/search/sort/qsort.h
index f032414576a86f4a32a3f7a637a933e562d649ea..543d608055894fd913e8acb07f888c68ad87cac9 100644 (file)
--- a/lib/search/sort/qsort.h
+++ b/lib/search/sort/qsort.h
@@ -16,7 +16,7 @@
 #define QSORT(T, a, n)  do                                            \
 {                                                                     \
        _Generic(a, T *: 0);                                          \
-       qsort(a, n, sizeof(T), CMP(T *));                             \
+       qsort(a, n, sizeof(T), CMP(T));                               \
 } while (0)