Move repeated #defines into tr_json_util.h and add documentation

[trust_router.git] / common / tr_filter_encoders.c

diff --git a/common/tr_filter_encoders.c b/common/tr_filter_encoders.c
index 932be9e..a69685d 100644 (file)
--- a/common/tr_filter_encoders.c
+++ b/common/tr_filter_encoders.c
@@ -37,24 +37,7 @@
 
 #include <tr_filter.h>
 #include <tr_constraint_internal.h>
-
-/* helper for below */
-#define OBJECT_SET_OR_FAIL(jobj, key, val)     \
-do {                                           \
-  if (val)                                     \
-    json_object_set_new((jobj),(key),(val));   \
-  else                                         \
-    goto cleanup;                              \
-} while (0)
-
-#define ARRAY_APPEND_OR_FAIL(jary, val)        \
-do {                                           \
-  if (val)                                     \
-    json_array_append_new((jary),(val));       \
-  else                                         \
-    goto cleanup;                              \
-} while (0)
-
+#include <tr_json_util.h>
 
 typedef json_t *(ITEM_ENCODER_FUNC)(void *);