From: Ivan Kruglov <mail@ikruglov.com>
Date: Fri, 4 Jul 2025 12:22:33 +0000 (-0700)
Subject: json: helper macros JSON_BUILD_PAIR_CONDITION_*()
X-Git-Tag: v259-rc1~306^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aacfa999ddd5d66ab45012d9496232c5834137bd;p=thirdparty%2Fsystemd.git

json: helper macros JSON_BUILD_PAIR_CONDITION_*()
---

diff --git a/src/core/varlink-cgroup.c b/src/core/varlink-cgroup.c
index 7e23d4a0f7a..db75560ae81 100644
--- a/src/core/varlink-cgroup.c
+++ b/src/core/varlink-cgroup.c
@@ -13,9 +13,6 @@
 #include "unit.h"
 #include "varlink-cgroup.h"
 
-#define JSON_BUILD_PAIR_CONDITION_UNSIGNED(condition, name, value) \
-        SD_JSON_BUILD_PAIR_CONDITION(condition, name, SD_JSON_BUILD_UNSIGNED(value))
-
 static int cpu_set_build_json(sd_json_variant **ret, const char *name, void *userdata) {
         _cleanup_free_ uint8_t *array = NULL;
         CPUSet *cpuset = ASSERT_PTR(userdata);
diff --git a/src/libsystemd/sd-json/json-util.h b/src/libsystemd/sd-json/json-util.h
index abacb298c6d..a3967cdeb5f 100644
--- a/src/libsystemd/sd-json/json-util.h
+++ b/src/libsystemd/sd-json/json-util.h
@@ -249,6 +249,11 @@ enum {
 #define JSON_BUILD_PAIR_PIDREF(name, p) SD_JSON_BUILD_PAIR(name, JSON_BUILD_PIDREF(p))
 #define JSON_BUILD_PAIR_DEVNUM(name, d) SD_JSON_BUILD_PAIR(name, JSON_BUILD_DEVNUM(d))
 
+#define JSON_BUILD_PAIR_CONDITION_UNSIGNED(condition, name, value) \
+        SD_JSON_BUILD_PAIR_CONDITION(condition, name, SD_JSON_BUILD_UNSIGNED(value))
+#define JSON_BUILD_PAIR_CONDITION_BOOLEAN(condition, name, value) \
+        SD_JSON_BUILD_PAIR_CONDITION(condition, name, SD_JSON_BUILD_BOOLEAN(value))
+
 int json_variant_new_pidref(sd_json_variant **ret, PidRef *pidref);
 int json_variant_new_devnum(sd_json_variant **ret, dev_t devnum);
 int json_variant_new_fd_info(sd_json_variant **ret, int fd);