From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 May 2015 09:30:14 +0000 (+0200)
Subject: util: use GNU comparison function prototype for qsort_safe()
X-Git-Tag: v226.4~1^2~390
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=24f59866c30d273ef47365c15ffcd1f86b8f019e;ds=sidebyside

util: use GNU comparison function prototype for qsort_safe()
---

diff --git a/src/shared/util.h b/src/shared/util.h
index b4e0b778a..1b3015115 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -780,12 +780,12 @@ int shall_restore_state(void);
  * Normal qsort requires base to be nonnull. Here were require
  * that only if nmemb > 0.
  */
-static inline void qsort_safe(void *base, size_t nmemb, size_t size,
-                              int (*compar)(const void *, const void *)) {
-        if (nmemb) {
-                assert(base);
-                qsort(base, nmemb, size, compar);
-        }
+static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_fn_t compar) {
+        if (nmemb <= 0)
+                return;
+
+        assert(base);
+        qsort(base, nmemb, size, compar);
 }
 
 int proc_cmdline(char **ret);