jansson: cleanup JSON_ESCAPE_SLASH use

src/output-json.c

@@ -364,12 +364,7 @@ int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer)
 
     int r = json_dump_callback(js, OutputJSONMemBufferCallback, &wrapper,
             JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII|
-#ifdef JSON_ESCAPE_SLASH
+            JSON_ESCAPE_SLASH);
-                            JSON_ESCAPE_SLASH
-#else
-                            0
-#endif
-                            );
     if (r != 0)
         return TM_ECODE_OK;
 

src/suricata-common.h

@@ -212,6 +212,9 @@
 
 #ifdef HAVE_LIBJANSSON
 #include <jansson.h>
+#ifndef JSON_ESCAPE_SLASH
+#define JSON_ESCAPE_SLASH 0
+#endif
 #endif
 
 #if CPPCHECK==1

src/unix-manager.c

@@ -290,12 +290,7 @@ int UnixCommandSendJSONToClient(UnixClient *client, json_t *js)
 
     int r = json_dump_callback(js, OutputJSONMemBufferCallback, &wrapper,
             JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII|
-#ifdef JSON_ESCAPE_SLASH
+            JSON_ESCAPE_SLASH);
-                            JSON_ESCAPE_SLASH
-#else
-                            0
-#endif
-                            );
     if (r != 0) {
         SCLogWarning(SC_ERR_SOCKET, "unable to serialize JSON object");
         return -1;

src/util-debug.c

@@ -233,12 +233,7 @@ int SCLogMessageJSON(struct timeval *tval, char *buffer, size_t buffer_size,
 
     char *js_s = json_dumps(js,
             JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII|
-#ifdef JSON_ESCAPE_SLASH
+            JSON_ESCAPE_SLASH);
-            JSON_ESCAPE_SLASH
-#else
-            0
-#endif
-            );
     snprintf(buffer, buffer_size, "%s", js_s);
     free(js_s);
 

src/util-profiling-rules.c

@@ -341,12 +341,7 @@ static void DumpJson(FILE *fp, SCProfileSummary *summary, uint32_t count, uint64
 
     char *js_s = json_dumps(js,
             JSON_PRESERVE_ORDER|JSON_COMPACT|JSON_ENSURE_ASCII|
-#ifdef JSON_ESCAPE_SLASH
+            JSON_ESCAPE_SLASH);
-            JSON_ESCAPE_SLASH
-#else
-            0
-#endif
-            );
 
     if (unlikely(js_s == NULL))
         return;