From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 10 Jul 2017 18:55:14 +0000 (-0400)
Subject: basic/strv: use existing qsort_safe() helper
X-Git-Tag: v234~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6d703c395745f9ff287cf7965b540f10c79186a;p=thirdparty%2Fsystemd.git

basic/strv: use existing qsort_safe() helper

strv_sort() predates qsort_safe(), but we can convert it to it to
save a few lines.
---

diff --git a/src/basic/strv.c b/src/basic/strv.c
index 0eec868eed1..c63f11c6ade 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -770,11 +770,7 @@ static int str_compare(const void *_a, const void *_b) {
 }
 
 char **strv_sort(char **l) {
-
-        if (strv_isempty(l))
-                return l;
-
-        qsort(l, strv_length(l), sizeof(char*), str_compare);
+        qsort_safe(l, strv_length(l), sizeof(char*), str_compare);
         return l;
 }