From: Victor Julien <victor@inliniac.net>
Date: Fri, 25 Mar 2016 12:11:04 +0000 (+0100)
Subject: mpm: remove unused max pattern len field
X-Git-Tag: suricata-3.1RC1~296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1980%2Fhead;p=thirdparty%2Fsuricata.git

mpm: remove unused max pattern len field
---

diff --git a/src/util-mpm-ac-bs.c b/src/util-mpm-ac-bs.c
index f8e313a175..3c3eac540b 100644
--- a/src/util-mpm-ac-bs.c
+++ b/src/util-mpm-ac-bs.c
@@ -95,9 +95,6 @@ typedef struct StateQueue_ {
 void MpmACBSRegister(void)
 {
     mpm_table[MPM_AC_BS].name = "ac-bs";
-    /* don't need this.  isn't that awesome?  no more chopping and blah blah */
-    mpm_table[MPM_AC_BS].max_pattern_length = 0;
-
     mpm_table[MPM_AC_BS].InitCtx = SCACBSInitCtx;
     mpm_table[MPM_AC_BS].InitThreadCtx = SCACBSInitThreadCtx;
     mpm_table[MPM_AC_BS].DestroyCtx = SCACBSDestroyCtx;
diff --git a/src/util-mpm-ac-tile.c b/src/util-mpm-ac-tile.c
index 72b2936962..3d7b3b5a91 100644
--- a/src/util-mpm-ac-tile.c
+++ b/src/util-mpm-ac-tile.c
@@ -1490,8 +1490,6 @@ void MpmACTileRegister(void)
 #else
     mpm_table[MPM_AC_TILE].name = "ac-ks";
 #endif
-    mpm_table[MPM_AC_TILE].max_pattern_length = 0;
-
     mpm_table[MPM_AC_TILE].InitCtx = SCACTileInitCtx;
     mpm_table[MPM_AC_TILE].InitThreadCtx = SCACTileInitThreadCtx;
     mpm_table[MPM_AC_TILE].DestroyCtx = SCACTileDestroyCtx;
diff --git a/src/util-mpm-ac.c b/src/util-mpm-ac.c
index fe37af19ba..6c3370b0d4 100644
--- a/src/util-mpm-ac.c
+++ b/src/util-mpm-ac.c
@@ -1755,9 +1755,6 @@ int MpmCudaBufferDeSetup(void)
 void MpmACRegister(void)
 {
     mpm_table[MPM_AC].name = "ac";
-    /* don't need this.  isn't that awesome?  no more chopping and blah blah */
-    mpm_table[MPM_AC].max_pattern_length = 0;
-
     mpm_table[MPM_AC].InitCtx = SCACInitCtx;
     mpm_table[MPM_AC].InitThreadCtx = SCACInitThreadCtx;
     mpm_table[MPM_AC].DestroyCtx = SCACDestroyCtx;
@@ -1782,9 +1779,6 @@ void MpmACRegister(void)
 void MpmACCudaRegister(void)
 {
     mpm_table[MPM_AC_CUDA].name = "ac-cuda";
-    /* don't need this.  isn't that awesome?  no more chopping and blah blah */
-    mpm_table[MPM_AC_CUDA].max_pattern_length = 0;
-
     mpm_table[MPM_AC_CUDA].InitCtx = SCACInitCtx;
     mpm_table[MPM_AC_CUDA].InitThreadCtx = SCACInitThreadCtx;
     mpm_table[MPM_AC_CUDA].DestroyCtx = SCACDestroyCtx;
diff --git a/src/util-mpm-hs.c b/src/util-mpm-hs.c
index e71a533d12..b046bfc940 100644
--- a/src/util-mpm-hs.c
+++ b/src/util-mpm-hs.c
@@ -1057,8 +1057,6 @@ void SCHSPrintInfo(MpmCtx *mpm_ctx)
 void MpmHSRegister(void)
 {
     mpm_table[MPM_HS].name = "hs";
-    mpm_table[MPM_HS].max_pattern_length = 0;
-
     mpm_table[MPM_HS].InitCtx = SCHSInitCtx;
     mpm_table[MPM_HS].InitThreadCtx = SCHSInitThreadCtx;
     mpm_table[MPM_HS].DestroyCtx = SCHSDestroyCtx;
diff --git a/src/util-mpm.h b/src/util-mpm.h
index d689cc9fc4..2c165bedab 100644
--- a/src/util-mpm.h
+++ b/src/util-mpm.h
@@ -152,8 +152,7 @@ typedef struct MpmCtxFactoryContainer_ {
 #define MPM_PATTERN_CTX_OWNS_ID     0x20
 
 typedef struct MpmTableElmt_ {
-    char *name;
-    uint8_t max_pattern_length;
+    const char *name;
     void (*InitCtx)(struct MpmCtx_ *);
     void (*InitThreadCtx)(struct MpmCtx_ *, struct MpmThreadCtx_ *);
     void (*DestroyCtx)(struct MpmCtx_ *);