From 05e062cb89052705442ee43c48979d926fb3fda9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 12 Nov 2018 12:50:06 +0100 Subject: [PATCH] locale-setup: use _cleanup_strv_free_ --- src/core/locale-setup.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index c14523fee9..c123f3906e 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -14,8 +14,8 @@ #include "virt.h" int locale_setup(char ***environment) { - char **add; char *variables[_VARIABLE_LC_MAX] = {}; + _cleanup_strv_free_ char **add = NULL; int r = 0, i; if (detect_container() <= 0) { @@ -64,7 +64,6 @@ int locale_setup(char ***environment) { log_warning_errno(r, "Failed to read /etc/locale.conf: %m"); } - add = NULL; for (i = 0; i < _VARIABLE_LC_MAX; i++) { char *s; @@ -98,8 +97,6 @@ int locale_setup(char ***environment) { r = 0; finish: - strv_free(add); - for (i = 0; i < _VARIABLE_LC_MAX; i++) free(variables[i]);