classtype: put UNITTESTS guards where appropriate

diff --git a/src/util-classification-config.c b/src/util-classification-config.c
index 2978b71a78afa7dab6384da4f7f058b2c30a1054..2b026d25cafe87ec26dac02c74ed599ea231a6ad 100644 (file)
--- 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 b161c540811e158b36dca4678651183dcccd87b8..57d76b95dcefc2aff244402608beb7835de3d8a3 100644 (file)
--- 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__ */