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

network: json: make {network,device}_build_json() accept NULL

Browse Source
This commit is contained in:
Yu Watanabe
2021-11-25 22:35:35 +09:00
parent cfb7e06b1e
commit 165e719948
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-json.c
+24 -22
View File
@@ -8,9 +8,13 @@
#include "sort-util.h"
static int network_build_json(Network *network, JsonVariant **ret) {
assert(network);
assert(ret);
if (!network) {
*ret = NULL;
return 0;
}
return json_build(ret, JSON_BUILD_OBJECT(
JSON_BUILD_PAIR_STRING("NetworkFile", network->filename)));
}
@@ -18,9 +22,13 @@ static int network_build_json(Network *network, JsonVariant **ret) {
static int device_build_json(sd_device *device, JsonVariant **ret) {
const char *link = NULL, *path = NULL, *vendor = NULL, *model = NULL;
assert(device);
assert(ret);
if (!device) {
*ret = NULL;
return 0;
}
(void) sd_device_get_property_value(device, "ID_NET_LINK_FILE", &link);
(void) sd_device_get_property_value(device, "ID_PATH", &path);
@@ -38,7 +46,7 @@ static int device_build_json(sd_device *device, JsonVariant **ret) {
}
int link_build_json(Link *link, JsonVariant **ret) {
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL, *w = NULL;
_cleanup_free_ char *type = NULL;
int r;
@@ -65,29 +73,23 @@ int link_build_json(Link *link, JsonVariant **ret) {
if (r < 0)
return r;
if (link->network) {
_cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
r = network_build_json(link->network, &w);
if (r < 0)
return r;
r = network_build_json(link->network, &w);
if (r < 0)
return r;
r = json_variant_merge(&v, w);
if (r < 0)
return r;
r = json_variant_merge(&v, w);
if (r < 0)
return r;
}
w = json_variant_unref(w);
if (link->sd_device) {
_cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
r = device_build_json(link->sd_device, &w);
if (r < 0)
return r;
r = device_build_json(link->sd_device, &w);
if (r < 0)
return r;
r = json_variant_merge(&v, w);
if (r < 0)
return r;
}
r = json_variant_merge(&v, w);
if (r < 0)
return r;
*ret = TAKE_PTR(v);
return 0;