From fc53809803cd2bc2434e312b19a18fa36776da12 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:50:40 +0200 Subject: Adding upstream version 256. Signed-off-by: Daniel Baumann --- src/environment-d-generator/environment-d-generator.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/environment-d-generator') diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index 90e31c9..fa751cb 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -17,7 +17,7 @@ static int environment_dirs(char ***ret) { _cleanup_free_ char *c = NULL; int r; - dirs = strv_new(CONF_PATHS_USR("environment.d"), NULL); + dirs = strv_new(CONF_PATHS("environment.d")); if (!dirs) return -ENOMEM; @@ -26,7 +26,7 @@ static int environment_dirs(char ***ret) { if (r < 0) return r; - r = strv_extend_front(&dirs, c); + r = strv_consume_prepend(&dirs, TAKE_PTR(c)); if (r < 0) return r; @@ -84,8 +84,7 @@ static int load_and_print(void) { static int run(int argc, char *argv[]) { int r; - log_parse_environment(); - log_open(); + log_setup(); if (argc > 1) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments."); -- cgit v1.2.3