From: Russ Combs <rucombs@cisco.com>
Date: Fri, 23 May 2014 17:02:02 +0000 (-0400)
Subject: tweaks for style and removed nhttp printf()s that break auto doc
X-Git-Tag: 3.0.0-233~1518
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ea8ff7b42f4436294b400466276e0a2fe5d6f2;p=thirdparty%2Fsnort3.git

tweaks for style and removed nhttp printf()s that break auto doc
---

diff --git a/src/framework/codec.h b/src/framework/codec.h
index cb4869f2c..92e1e9803 100644
--- a/src/framework/codec.h
+++ b/src/framework/codec.h
@@ -112,7 +112,8 @@ static inline bool update_buffer(Buffer* buf, size_t n)
 
 
 
-class Codec {
+class Codec
+{
 public:
     virtual ~Codec() { };
 
diff --git a/src/framework/ips_option.h b/src/framework/ips_option.h
index e4934c241..cd9efc576 100644
--- a/src/framework/ips_option.h
+++ b/src/framework/ips_option.h
@@ -41,7 +41,8 @@ struct Packet;
 
 struct SnortConfig;
 
-class IpsOption {
+class IpsOption
+{
 public:
     virtual ~IpsOption() { };
 
diff --git a/src/framework/logger.h b/src/framework/logger.h
index dd9980ebf..831cfd47c 100644
--- a/src/framework/logger.h
+++ b/src/framework/logger.h
@@ -48,7 +48,8 @@ struct Packet;
 // other methods are packet thread specific
 //-------------------------------------------------------------------------
 
-class Logger {
+class Logger
+{
 public:
     virtual ~Logger() { };
 
diff --git a/src/service_inspectors/back_orifice/back_orifice.cc b/src/service_inspectors/back_orifice/back_orifice.cc
index 94bdcc8a7..555086f53 100644
--- a/src/service_inspectors/back_orifice/back_orifice.cc
+++ b/src/service_inspectors/back_orifice/back_orifice.cc
@@ -452,20 +452,20 @@ static int BoGetDirection(Packet *p, char *pkt_data)
 // class stuff
 //-------------------------------------------------------------------------
 
-class BoPH : public Inspector {
+class BackOrifice : public Inspector {
 public:
-    BoPH() { };
+    BackOrifice() { };
 
     void show(SnortConfig*);
     void eval(Packet*);
 };
 
-void BoPH::show(SnortConfig*)
+void BackOrifice::show(SnortConfig*)
 {
     LogMessage("%s\n", mod_name);
 }
 
-void BoPH::eval(Packet *p)
+void BackOrifice::eval(Packet *p)
 {
     uint16_t cyphertext_referent;
     uint16_t cyphertext_suffix;
@@ -592,7 +592,7 @@ void bo_init()
 
 static Inspector* bo_ctor(Module*)
 {
-    return new BoPH;
+    return new BackOrifice;
 }
 
 static void bo_dtor(Inspector* p)
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_module.cc b/src/service_inspectors/nhttp_inspect/nhttp_module.cc
index 04ac352e9..81e0e9a50 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_module.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_module.cc
@@ -60,7 +60,6 @@ bool NHttpModule::set(const char*, Value &val, SnortConfig*) {
 }
 
 unsigned NHttpModule::get_gid() const {
-    printf("NHttpModule get_gid()\n");
     return GID_HTTP_CLIENT;
 }
 
diff --git a/src/service_inspectors/nhttp_inspect/nhttp_module.h b/src/service_inspectors/nhttp_inspect/nhttp_module.h
index 22f1f8f25..37c55b0ba 100644
--- a/src/service_inspectors/nhttp_inspect/nhttp_module.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_module.h
@@ -32,7 +32,7 @@
 class NHttpModule : public Module
 {
 public:
-    NHttpModule() : Module("nhttp_inspect", nhttpParams) { printf("NHttpModule constructor()\n"); };
+    NHttpModule() : Module("nhttp_inspect", nhttpParams) { };
     bool begin(const char*, int, SnortConfig*);
     bool end(const char*, int, SnortConfig*);
     bool set(const char*, Value&, SnortConfig*);