]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
ftp: Remove LIBJANSSON guards
authorJeff Lucovsky <jeff@lucovsky.org>
Wed, 21 Aug 2019 23:26:40 +0000 (19:26 -0400)
committerVictor Julien <victor@inliniac.net>
Mon, 26 Aug 2019 08:15:10 +0000 (10:15 +0200)
src/app-layer-ftp.c
src/app-layer-ftp.h

index a48facc150b92337305a8584312bd81ce66ff40d..dee2b782492aecf08d12d346cb2e035149b32cb7 100644 (file)
@@ -1363,7 +1363,6 @@ void FTPAtExitPrintStats(void)
 }
 
 
-#ifdef HAVE_LIBJANSSON
 /*
  * \brief Returns the ending offset of the next line from a multi-line buffer.
  *
@@ -1417,7 +1416,6 @@ json_t *JsonFTPDataAddMetadata(const Flow *f)
     }
     return ftpd;
 }
-#endif /* HAVE_LIBJANSSON */
 
 /* UNITTESTS */
 #ifdef UNITTESTS
index 50b6082c9ae01a277f987c1e61b8c24368ac4540..a23ede4cf482aec6a9d614c45d12f059619af736 100644 (file)
@@ -218,10 +218,8 @@ void FTPAtExitPrintStats(void);
 uint64_t FTPMemuseGlobalCounter(void);
 uint64_t FTPMemcapGlobalCounter(void);
 
-#ifdef HAVE_LIBJANSSON
 uint16_t JsonGetNextLineFromBuffer(const char *buffer, const uint16_t len);
 json_t *JsonFTPDataAddMetadata(const Flow *f);
-#endif
 
 #endif /* __APP_LAYER_FTP_H__ */