system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-29 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Yu Watanabe 2024-06-18 00:06:59 +09:00
parent 3dc546ad75
commit e367b42664
10 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/basic/env-util.c
View file

@ -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);
}

3
src/basic/time-util.c
View file

@ -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;

9
src/boot/measure.c
View file

@ -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, ", ");

3
src/home/homectl.c
View file

@ -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);

3
src/locale/localectl.c
View file

@ -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);

3
src/shared/journal-util.c
View file

@ -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)

3
src/shared/userdb.c
View file

@ -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;

3
src/ssh-generator/ssh-generator.c
View file

@ -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.");

6
src/sysusers/sysusers.c
View file

@ -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;

4
src/varlinkctl/varlinkctl.c
View file

@ -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);