diff options
| -rw-r--r-- | src/locale/localectl.c | 41 | ||||
| -rw-r--r-- | src/shared/macro.h | 1 | ||||
| -rw-r--r-- | src/shared/set.c | 8 | ||||
| -rw-r--r-- | src/shared/set.h | 1 |
4 files changed, 23 insertions, 28 deletions
diff --git a/src/locale/localectl.c b/src/locale/localectl.c index b3acb3ec45..290edcc103 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -384,15 +384,14 @@ static int add_locales_from_archive(Set *locales) { } static int add_locales_from_libdir (Set *locales) { - DIR *dir; + DIR _cleanup_closedir_ *dir; struct dirent *entry; int r; dir = opendir("/usr/lib/locale"); if (!dir) { log_error("Failed to open locale directory: %m"); - r = -errno; - goto finish; + return -errno; } errno = 0; @@ -406,10 +405,8 @@ static int add_locales_from_libdir (Set *locales) { continue; z = strdup(entry->d_name); - if (!z) { - r = log_oom(); - goto finish; - } + if (!z) + return log_oom(); r = set_put(locales, z); if (r < 0) { @@ -417,7 +414,7 @@ static int add_locales_from_libdir (Set *locales) { if (r != -EEXIST) { log_error("Failed to add locale: %s", strerror(-r)); - goto finish; + return r; } } @@ -426,19 +423,14 @@ static int add_locales_from_libdir (Set *locales) { if (errno != 0) { log_error("Failed to read locale directory: %m"); - r = -errno; - goto finish; + return -errno; } - r = 0; - - finish: - closedir(dir); - return r; + return 0; } static int list_locales(DBusConnection *bus, char **args, unsigned n) { - Set *locales; + _cleanup_set_free_ Set *locales; _cleanup_strv_free_ char **l = NULL; char **j; int r; @@ -449,17 +441,15 @@ static int list_locales(DBusConnection *bus, char **args, unsigned n) { r = add_locales_from_archive(locales); if (r < 0 && r != -ENOENT) - goto finish; + return r; r = add_locales_from_libdir(locales); if (r < 0) - goto finish; + return r; l = set_get_strv(locales); - if (!l) { - r = log_oom(); - goto finish; - } + if (!l) + return log_oom(); strv_sort(l); @@ -468,12 +458,7 @@ static int list_locales(DBusConnection *bus, char **args, unsigned n) { STRV_FOREACH(j, l) puts(*j); - r = 0; - -finish: - set_free(locales); - - return r; + return 0; } static int set_vconsole_keymap(DBusConnection *bus, char **args, unsigned n) { diff --git a/src/shared/macro.h b/src/shared/macro.h index 700171b832..29d91392f8 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -199,6 +199,7 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) { #define _cleanup_close_ __attribute__((cleanup(closep))) #define _cleanup_closedir_ __attribute__((cleanup(closedirp))) #define _cleanup_umask_ __attribute__((cleanup(umaskp))) +#define _cleanup_set_free_ __attribute__((cleanup(set_freep))) #define _cleanup_strv_free_ __attribute__((cleanup(strv_freep))) #define VA_FORMAT_ADVANCE(format, ap) \ diff --git a/src/shared/set.c b/src/shared/set.c index 5f83c50839..53399b655b 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -37,6 +37,14 @@ void set_free(Set* s) { hashmap_free(MAKE_HASHMAP(s)); } +void set_freep(Set **s) { + if (!s) + return; + + set_free(*s); + *s = NULL; +} + void set_free_free(Set *s) { hashmap_free_free(MAKE_HASHMAP(s)); } diff --git a/src/shared/set.h b/src/shared/set.h index 9162e2ae80..ed5b5a44d6 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -33,6 +33,7 @@ typedef struct Set Set; Set *set_new(hash_func_t hash_func, compare_func_t compare_func); void set_free(Set* s); +void set_freep(Set **s); void set_free_free(Set *s); Set* set_copy(Set *s); int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func); |