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: chiark/234.4-1+devuan1.1+iwj1~73
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a185a2fe0710e5ed943f7786119a3a0f4473b844

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 c2defbe97..f0c764b17 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -782,11 +782,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;
 }