tree-wide: replace strv_sort() + strv_uniq() -> strv_sort_uniq()

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 9e74ba0f0fc69a5d05550f3ee0601c28012a9a30..2bd532caa12511e26308e474f1d528a73e9f196b 100644 (file)
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -941,11 +941,11 @@ int replace_env_argv(
         }
 
         if (ret_unset_variables) {
-                strv_uniq(strv_sort(unset_variables));
+                strv_sort_uniq(unset_variables);
                 *ret_unset_variables = TAKE_PTR(unset_variables);
         }
         if (ret_bad_variables) {
-                strv_uniq(strv_sort(bad_variables));
+                strv_sort_uniq(bad_variables);
                 *ret_bad_variables = TAKE_PTR(bad_variables);
         }
 

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index b94f37c31c31e45e7ee04f25fcd3c94c5e481b6f..cd35e8a73c76e8658cc03885edee38f73dec8884 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1519,8 +1519,7 @@ int get_timezones(char ***ret) {
         if (r < 0)
                 return r;
 
-        strv_sort(zones);
-        strv_uniq(zones);
+        strv_sort_uniq(zones);
 
         *ret = TAKE_PTR(zones);
         return 0;

diff --git a/src/boot/measure.c b/src/boot/measure.c
index dca70d74a2493a59c3b5714a0fbfbbfc98699da3..01e1fc7318aa1fbe67d701b49244fe8e5e5d78d3 100644 (file)
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -329,8 +329,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return log_oom();
         }
 
-        strv_sort(arg_banks);
-        strv_uniq(arg_banks);
+        strv_sort_uniq(arg_banks);
 
         if (arg_current)
                 for (UnifiedSection us = 0; us < _UNIFIED_SECTION_MAX; us++)
@@ -347,10 +346,8 @@ static int parse_argv(int argc, char *argv[]) {
                                      "enter-initrd:leave-initrd:sysinit",
                                      "enter-initrd:leave-initrd:sysinit:ready") < 0)
                         return log_oom();
-        } else {
-                strv_sort(arg_phase);
-                strv_uniq(arg_phase);
-        }
+        } else
+                strv_sort_uniq(arg_phase);
 
         _cleanup_free_ char *j = NULL;
         j = strv_join(arg_phase, ", ");

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 535422537e9ece5d81e7347d7345b09f1577b483..f2a04d5a0ce1f476985d4dc24754057ce2e6525f 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -3836,8 +3836,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 if (r < 0)
                                         return log_oom();
 
-                                strv_sort(list);
-                                strv_uniq(list);
+                                strv_sort_uniq(list);
 
                                 mo = sd_json_variant_unref(mo);
                                 r = sd_json_variant_new_array_strv(&mo, list);

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 32354027f1755ef6d445b44fbc716f35fbf2e598..9a2163bcfef3b42b07875e50675b804f9cefdda5 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -374,8 +374,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
                 return log_error_errno(SYNTHETIC_ERRNO(ENOENT),
                                        "Couldn't find any entries.");
 
-        strv_sort(list);
-        strv_uniq(list);
+        strv_sort_uniq(list);
 
         pager_open(arg_pager_flags);
 

diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c
index ab70f4da0d8bb4015d9aa7d49f3bf134cc0c9c0d..11d5d68478a50044741cf127cffe45a52a557b14 100644 (file)
--- a/src/shared/journal-util.c
+++ b/src/shared/journal-util.c
@@ -58,8 +58,7 @@ static int access_check_var_log_journal(sd_journal *j, bool want_other_users) {
                 if (r < 0)
                         return log_oom();
 
-                strv_sort(g);
-                strv_uniq(g);
+                strv_sort_uniq(g);
 
                 s = strv_join(g, "', '");
                 if (!s)

diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index caf05302d9cba9db35acb38602a9c23b387ad024..dca79cc735e79b45683672f43d4fff9f8a9cdeb7 100644 (file)
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -1436,8 +1436,7 @@ int membershipdb_by_group_strv(const char *name, UserDBFlags flags, char ***ret)
                         return r;
         }
 
-        strv_sort(members);
-        strv_uniq(members);
+        strv_sort_uniq(members);
 
         *ret = TAKE_PTR(members);
         return 0;

diff --git a/src/ssh-generator/ssh-generator.c b/src/ssh-generator/ssh-generator.c
index c671b4170336686da48741375090035329ddd5b8..842f0b3a940017409861cc8a1e1c68d76c0d1296 100644 (file)
--- a/src/ssh-generator/ssh-generator.c
+++ b/src/ssh-generator/ssh-generator.c
@@ -453,8 +453,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late)
 
         (void) parse_credentials();
 
-        strv_sort(arg_listen_extra);
-        strv_uniq(arg_listen_extra);
+        strv_sort_uniq(arg_listen_extra);
 
         if (!arg_auto && strv_isempty(arg_listen_extra)) {
                 log_debug("Disabling SSH generator logic, because as it has been turned off explicitly.");

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 52f4a47aa1f5aec8281743e46b94c27aa6df752a..9471c1843e19bd1e0d2f5475e17ff9cbd35371f9 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -362,8 +362,7 @@ static int putgrent_with_members(
                 if (added) {
                         struct group t;
 
-                        strv_uniq(l);
-                        strv_sort(l);
+                        strv_sort_uniq(l);
 
                         t = *gr;
                         t.gr_mem = l;
@@ -411,8 +410,7 @@ static int putsgent_with_members(
                 if (added) {
                         struct sgrp t;
 
-                        strv_uniq(l);
-                        strv_sort(l);
+                        strv_sort_uniq(l);
 
                         t = *sg;
                         t.sg_mem = l;

diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c
index 3057c0542cbf03e79dd5bf2697acba34048617b9..5a137e8f16a42b011ff621efebcd69338909fae2 100644 (file)
--- a/src/varlinkctl/varlinkctl.c
+++ b/src/varlinkctl/varlinkctl.c
@@ -336,7 +336,7 @@ static int verb_introspect(int argc, char *argv[], void *userdata) {
                 if (strv_isempty(auto_interfaces))
                         return log_error_errno(SYNTHETIC_ERRNO(ENXIO), "Service doesn't report any implemented interfaces.");
 
-                interfaces = strv_sort(strv_uniq(auto_interfaces));
+                interfaces = strv_sort_uniq(auto_interfaces);
         }
 
         /* Automatically switch on JSON_SEQ if we output multiple JSON objects */
@@ -405,7 +405,7 @@ static int verb_introspect(int argc, char *argv[], void *userdata) {
         if (list_methods) {
                 pager_open(arg_pager_flags);
 
-                strv_sort(strv_uniq(methods));
+                strv_sort_uniq(methods);
 
                 if (FLAGS_SET(arg_json_format_flags, SD_JSON_FORMAT_OFF))
                         strv_print(methods);