From: Victor Julien <victor@inliniac.net>
Date: Tue, 1 Oct 2019 10:02:47 +0000 (+0200)
Subject: classtype: put UNITTESTS guards where appropriate
X-Git-Tag: suricata-5.0.0~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26e2370f99c9697f1d937d01c4d79b21eb5ff775;p=thirdparty%2Fsuricata.git

classtype: put UNITTESTS guards where appropriate
---

diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 2978b71a78..2b026d25ca 100644
--- a/src/util-classification-config.c
+++ b/src/util-classification-config.c
@@ -823,23 +823,16 @@ static int SCClassConfTest06(void)
     return result;
 }
 
-#endif /* UNITTESTS */
-
 /**
  * \brief This function registers unit tests for Classification Config API.
  */
 void SCClassConfRegisterTests(void)
 {
-
-#ifdef UNITTESTS
-
     UtRegisterTest("SCClassConfTest01", SCClassConfTest01);
     UtRegisterTest("SCClassConfTest02", SCClassConfTest02);
     UtRegisterTest("SCClassConfTest03", SCClassConfTest03);
     UtRegisterTest("SCClassConfTest04", SCClassConfTest04);
     UtRegisterTest("SCClassConfTest05", SCClassConfTest05);
     UtRegisterTest("SCClassConfTest06", SCClassConfTest06);
-
-#endif /* UNITTESTS */
-
 }
+#endif /* UNITTESTS */
diff --git a/src/util-classification-config.h b/src/util-classification-config.h
index b161c54081..57d76b95dc 100644
--- a/src/util-classification-config.h
+++ b/src/util-classification-config.h
@@ -46,14 +46,16 @@ void SCClassConfLoadClassficationConfigFile(DetectEngineCtx *, FILE *fd);
 SCClassConfClasstype *SCClassConfGetClasstype(const char *,
                                               DetectEngineCtx *);
 void SCClassConfDeInitContext(DetectEngineCtx *);
-void SCClassConfRegisterTests(void);
+
+void SCClassConfInit(void);
+void SCClassConfDeinit(void);
 
 /* for unittests */
+#ifdef UNITTESTS
+void SCClassConfRegisterTests(void);
 FILE *SCClassConfGenerateValidDummyClassConfigFD01(void);
 FILE *SCClassConfGenerateInValidDummyClassConfigFD02(void);
 FILE *SCClassConfGenerateInValidDummyClassConfigFD03(void);
-
-void SCClassConfInit(void);
-void SCClassConfDeinit(void);
+#endif
 
 #endif /* __UTIL_CLASSIFICATION_CONFIG_H__ */