Remove json_variant_merge_pair() in favor of json_variant_set_field_non_null()

[thirdparty/systemd.git] / src / shared / json.h

diff --git a/src/shared/json.h b/src/shared/json.h
index 3e9424c240abc9bf21034aaa8d8203e6a3164fdd..861ef495b5c2fef72b6f4923e30bae00ca5ceb24 100644 (file)
--- a/src/shared/json.h
+++ b/src/shared/json.h
@@ -211,6 +211,10 @@ int json_variant_set_field_unsigned(JsonVariant **v, const char *field, uint64_t
 int json_variant_set_field_boolean(JsonVariant **v, const char *field, bool b);
 int json_variant_set_field_strv(JsonVariant **v, const char *field, char **l);
 
+static inline int json_variant_set_field_non_null(JsonVariant **v, const char *field, JsonVariant *value) {
+        return value && !json_variant_is_null(value) ? json_variant_set_field(v, field, value) : 0;
+}
+
 JsonVariant *json_variant_find(JsonVariant *haystack, JsonVariant *needle);
 
 int json_variant_append_array(JsonVariant **v, JsonVariant *element);
@@ -219,7 +223,6 @@ int json_variant_append_array_nodup(JsonVariant **v, JsonVariant *element);
 
 int json_variant_merge_object(JsonVariant **v, JsonVariant *m);
 int json_variant_merge_objectb(JsonVariant **v, ...);
-int json_variant_merge_pair(JsonVariant **v, const char *name, JsonVariant *w);
 
 int json_variant_strv(JsonVariant *v, char ***ret);