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 cb4869f2c0b79537ec3731f8dc1d174fa65cf908..92e1e98033cba65d3cfcd27d22fe7a52bde6e7fb 100644 (file)
--- 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 e4934c2416e4a7dd7e8487b93384c9f41c6838ba..cd9efc57609758b727ba3c7cdfd24c36c383765e 100644 (file)
--- 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 dd9980ebf1d4c825bd5ad92b85e438cde6170f4e..831cfd47ce68d560d053e1a4ae5f0111b88337e3 100644 (file)
--- 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 94bdcc8a775947df9b4389ad26afd5eaaac04017..555086f53cc79858eabdedeb9f5cebdaee673570 100644 (file)
--- 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 04ac352e9a1e680acc82a3667f27f2bdf0281643..81e0e9a504b6c17dbc17976ad32ccf11b481e26d 100644 (file)
--- 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 22f1f8f251177d4e0462a9740c4f43fc08a01e7b..37c55b0ba01da8ebf885504df800b6785b092fd8 100644 (file)
--- 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*);