SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-json: use strv_env_get_merged()

Browse Source
This commit is contained in:
Yu Watanabe
2024-10-31 11:02:35 +09:00
parent 7633001cdd
commit 32d77f5df8
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-json/sd-json.c
+4 -12
View File
@@ -11,6 +11,7 @@
#include "alloc-util.h"
#include "ansi-color.h"
#include "env-util.h"
#include "errno-util.h"
#include "escape.h"
#include "ether-addr-util.h"
@@ -3867,22 +3868,13 @@ _public_ int sd_json_buildv(sd_json_variant **ret, va_list ap) {
l = va_arg(ap, char **);
_cleanup_strv_free_ char **el = NULL;
STRV_FOREACH_PAIR(x, y, l) {
char *n = NULL;
if (current->n_suppress == 0) {
_cleanup_strv_free_ char **el = NULL;
n = strjoin(*x, "=", *y);
if (!n) {
r = -ENOMEM;
goto finish;
}
r = strv_consume(&el, n);
r = strv_env_get_merged(l, &el);
if (r < 0)
goto finish;
}
if (current->n_suppress == 0) {
r = sd_json_variant_new_array_strv(&add, el);
if (r < 0)
goto finish;