From: Eric Leblond <eric@regit.org>
Date: Tue, 16 Jul 2013 14:50:45 +0000 (+0200)
Subject: Suppress Suri prefix.
X-Git-Tag: suricata-2.0beta2~456
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e68b357c705e1e78f6613223d92c66de226ecfd;p=thirdparty%2Fsuricata.git

Suppress Suri prefix.
---

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index f5d2f997dd..5e8fc87e15 100644
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -116,7 +116,7 @@
 void RegisterAllModules();
 void TmqhSetup (void);
 
-int SuriRunUnittests(int list_unittests, char *regex_arg)
+int RunUnittests(int list_unittests, char *regex_arg)
 {
 #ifdef UNITTESTS
     /* Initializations for global vars, queues, etc (memsets, mutex init..) */
diff --git a/src/runmode-unittests.h b/src/runmode-unittests.h
index fe15e32554..8ccd296d58 100644
--- a/src/runmode-unittests.h
+++ b/src/runmode-unittests.h
@@ -24,6 +24,6 @@
 #ifndef __UTIL_RUNMODE_UNITTESTS_H__
 #define __UTIL_RUNMODE_UNITTESTS_H__
 
-int SuriRunUnittests(int list_unittests, char *regex_arg);
+int RunUnittests(int list_unittests, char *regex_arg);
 
 #endif /* __UTIL_RUNMODE_UNITTESTS_H__ */
diff --git a/src/suricata.c b/src/suricata.c
index 8127ed2540..f1249d6f54 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -1478,21 +1478,21 @@ int main(int argc, char **argv)
     }
 
     if (list_keywords) {
-        return SuriListKeywords(keyword_info);
+        return ListKeywords(keyword_info);
     }
 
     if (list_app_layer_protocols) {
-        return SuriListAppLayerProtocols();
+        return ListAppLayerProtocols();
     }
 
 #ifdef __SC_CUDA_SUPPORT__
     if (list_cuda_cards) {
-        return SuriListCudaCards();
+        return ListCudaCards();
     }
 #endif
 
     if (run_mode == RUNMODE_UNITTEST) {
-        return SuriRunUnittests(list_unittests, regex_arg);
+        return RunUnittests(list_unittests, regex_arg);
     }
 
 #ifdef REVISION
diff --git a/src/util-running-modes.c b/src/util-running-modes.c
index dda9dae3de..6a03dbd7ed 100644
--- a/src/util-running-modes.c
+++ b/src/util-running-modes.c
@@ -26,14 +26,14 @@
 #include "util-cuda.h"
 #include "util-unittest.h"
 
-int SuriListKeywords(const char *keyword_info)
+int ListKeywords(const char *keyword_info)
 {
     SigTableSetup(); /* load the rule keywords */
     SigTableList(keyword_info);
     exit(EXIT_SUCCESS);
 }
 
-int SuriListAppLayerProtocols()
+int ListAppLayerProtocols()
 {
     MpmTableSetup();
     AppLayerDetectProtoThreadInit();
@@ -42,7 +42,7 @@ int SuriListAppLayerProtocols()
 }
 
 #ifdef __SC_CUDA_SUPPORT__
-int SuriListCudaCards()
+int ListCudaCards()
 {
     SCCudaInitCudaEnvironment();
     SCCudaListCards();
diff --git a/src/util-running-modes.h b/src/util-running-modes.h
index 404fd7e0f6..b373f5aafa 100644
--- a/src/util-running-modes.h
+++ b/src/util-running-modes.h
@@ -24,10 +24,10 @@
 #define __UTIL_RUNNING_MODES_H__
 
 
-int SuriListKeywords(const char *keyword_info);
-int SuriListAppLayerProtocols();
+int ListKeywords(const char *keyword_info);
+int ListAppLayerProtocols();
 #ifdef __SC_CUDA_SUPPORT__
-int SuriListCudaCards();
+int ListCudaCards();
 #endif
 
 #endif /* __UTIL_RUNNING_MODES_H__ */