From: Alejandro Colomar Date: Sat, 15 Nov 2025 19:47:43 +0000 (+0100) Subject: lib/search/: Simplify CMP() X-Git-Tag: 4.19.0-rc1~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf8b68153ee044c8846b841e2f4d6a6792a345b0;p=thirdparty%2Fshadow.git lib/search/: Simplify CMP() Signed-off-by: Alejandro Colomar --- diff --git a/lib/search/cmp/cmp.h b/lib/search/cmp/cmp.h index 2f8822119..49443f673 100644 --- 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 eb102dc55..acc61ae4c 100644 --- 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 6f00f3bb1..57306a517 100644 --- 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 f03241457..543d60805 100644 --- 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)