From e367b4266492fede564e5edb21eda465a59b60ff Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Jun 2024 00:06:59 +0900 Subject: [PATCH] tree-wide: replace strv_sort() + strv_uniq() -> strv_sort_uniq() --- src/basic/env-util.c | 4 ++-- src/basic/time-util.c | 3 +-- src/boot/measure.c | 9 +++------ src/home/homectl.c | 3 +-- src/locale/localectl.c | 3 +-- src/shared/journal-util.c | 3 +-- src/shared/userdb.c | 3 +-- src/ssh-generator/ssh-generator.c | 3 +-- src/sysusers/sysusers.c | 6 ++---- src/varlinkctl/varlinkctl.c | 4 ++-- 10 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/basic/env-util.c b/src/basic/env-util.c index 9e74ba0f0f..2bd532caa1 100644 --- 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 b94f37c31c..cd35e8a73c 100644 --- 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 dca70d74a2..01e1fc7318 100644 --- 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 535422537e..f2a04d5a0c 100644 --- 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 32354027f1..9a2163bcfe 100644 --- 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 ab70f4da0d..11d5d68478 100644 --- 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 caf05302d9..dca79cc735 100644 --- 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 c671b41703..842f0b3a94 100644 --- 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 52f4a47aa1..9471c1843e 100644 --- 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 3057c0542c..5a137e8f16 100644 --- 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); -- 2.25.1