summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-12 12:50:06 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-14 17:01:54 +0100
commit05e062cb89052705442ee43c48979d926fb3fda9 (patch)
tree55fd1f65907f721b422d0a0dc62e8a0197779816 /src
parent78b30ee056796e7fbb2eb5e8ed9363511da9fa5d (diff)
downloadsystemd-05e062cb89052705442ee43c48979d926fb3fda9.tar.gz
systemd-05e062cb89052705442ee43c48979d926fb3fda9.tar.bz2
systemd-05e062cb89052705442ee43c48979d926fb3fda9.zip
locale-setup: use _cleanup_strv_free_
Diffstat (limited to 'src')
-rw-r--r--src/core/locale-setup.c5
1 files changed, 1 insertions, 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]);