json: remove unused jansson wrappers

pull/5738/head
Victor Julien 4 years ago
parent b6b317cae6
commit c25afbccc1

@ -96,20 +96,6 @@ void OutputJsonRegister (void)
traffic_label_prefix_len = strlen(TRAFFIC_LABEL_PREFIX);
}
json_t *SCJsonBool(int val)
{
return (val ? json_true() : json_false());
}
/**
* Wrap json_decref. This is mainly to expose this function to Rust as its
* defined in the Jansson header file as an inline function.
*/
void SCJsonDecref(json_t *json)
{
json_decref(json);
}
json_t *SCJsonString(const char *val)
{
if (val == NULL){

@ -112,9 +112,7 @@ typedef struct OutputJsonThreadCtx_ {
MemBuffer *buffer;
} OutputJsonThreadCtx;
json_t *SCJsonBool(int val);
json_t *SCJsonString(const char *val);
void SCJsonDecref(json_t *js);
void EveAddCommonOptions(const OutputJsonCommonSettings *cfg,
const Packet *p, const Flow *f, JsonBuilder *js);

@ -257,11 +257,6 @@ typedef unsigned char u_char
#ifndef JSON_ESCAPE_SLASH
#define JSON_ESCAPE_SLASH 0
#endif
/* Appears not all current distros have jansson that defines this. */
#ifndef json_boolean
#define json_boolean(val) SCJsonBool((val))
//#define json_boolean(val) ((val) ? json_true() : json_false())
#endif
#ifdef HAVE_MAGIC
#include <magic.h>

Loading…
Cancel
Save