shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

strv: add strv_print

Browse Source 
Clearer, and spares the temp variable.
This commit is contained in:
Thomas Hindoe Paaboel Andersen 2013-02-07 00:15:27 +01:00
parent fa3cd7394c
commit 7c2d80944a
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/locale/localectl.c
View File

@ -432,7 +432,6 @@ static int add_locales_from_libdir (Set *locales) {
static int list_locales(DBusConnection *bus, char **args, unsigned n) {
_cleanup_set_free_ Set *locales;
_cleanup_strv_free_ char **l = NULL;
char **j;
int r;
locales = set_new(string_hash_func, string_compare_func);
@ -455,8 +454,7 @@ static int list_locales(DBusConnection *bus, char **args, unsigned n) {
pager_open_if_enabled();
STRV_FOREACH(j, l)
puts(*j);
strv_print(l);
return 0;
}
@ -539,7 +537,6 @@ static int nftw_cb(
static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
char _cleanup_strv_free_ **l = NULL;
char **i;
keymaps = set_new(string_hash_func, string_compare_func);
if (!keymaps)
@ -566,9 +563,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) {
pager_open_if_enabled();
STRV_FOREACH(i, l)
puts(*i);
strv_print(l);
return 0;
}

10
src/shared/strv.c
View File

@ -774,3 +774,13 @@ char **strv_sort(char **l) {
qsort(l, strv_length(l), sizeof(char*), str_compare);
return l;
}
void strv_print(char **l) {
char **s;
if (!l)
return;
STRV_FOREACH(s, l)
puts(*s);
}

1
src/shared/strv.h
View File

@ -87,3 +87,4 @@ bool strv_overlap(char **a, char **b);
char **strv_sort(char **l);
void strv_print(char **l);

12
src/test/test-env-replace.c
View File

@ -58,10 +58,7 @@ int main(int argc, char *argv[]) {
strv_free(a);
r = replace_env_argv((char**) line, (char**) env);
STRV_FOREACH(i, r)
printf("%s\n", *i);
strv_print(r);
strv_free(r);
t = normalize_env_assignment("foo=bar");
@ -127,16 +124,13 @@ int main(int argc, char *argv[]) {
strv_free(a);
strv_free(b);
STRV_FOREACH(i, r)
printf("%s\n", *i);
strv_print(r);
printf("CLEANED UP:\n");
r = strv_env_clean(r);
STRV_FOREACH(i, r)
printf("%s\n", *i);
strv_print(r);
strv_free(r);
return 0;

4
src/timedate/timedatectl.c
View File

@ -425,7 +425,6 @@ static int list_timezones(DBusConnection *bus, char **args, unsigned n) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_strv_free_ char **zones = NULL;
size_t n_zones = 0;
char **i;
assert(args);
assert(n == 1);
@ -487,8 +486,7 @@ static int list_timezones(DBusConnection *bus, char **args, unsigned n) {
pager_open_if_enabled();
strv_sort(zones);
STRV_FOREACH(i, zones)
puts(*i);
strv_print(zones);
return 0;
}