mpm: cleanup, remove unused structs and prototypes

diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h
index 3f88c164127d92ed1cf33451190a54e7758ad0fd..de687876a3f74caaf2c0f52b36aba3d54ed1fe8f 100644 (file)
--- a/src/detect-engine-mpm.h
+++ b/src/detect-engine-mpm.h
@@ -74,11 +74,6 @@ TmEcode DetectEngineThreadCtxDeinit(ThreadVars *, void *);
 
 void DbgPrintSearchStats();
 
-MpmPatternIdStore *MpmPatternIdTableInitHash(void);
-void MpmPatternIdTableFreeHash(MpmPatternIdStore *);
-uint32_t MpmPatternIdStoreGetMaxId(MpmPatternIdStore *);
-uint32_t DetectContentGetId(MpmPatternIdStore *, DetectContentData *);
-
 int SignatureHasPacketContent(const Signature *);
 int SignatureHasStreamContent(const Signature *);
 

diff --git a/src/detect.h b/src/detect.h
index beb4aca097bf6e910b64818888c181ba613a306d..765a870aa23ed4604557c09c6e4aaf54ae7356d8 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -515,15 +515,6 @@ typedef struct DetectEngineLookupFlow_ {
  */
 #define FLOW_STATES 2
 
-/* mpm pattern id api */
-typedef struct MpmPatternIdStore_ {
-    HashTable *hash;
-    PatIntId max_id;
-
-    uint32_t unique_patterns;
-    uint32_t shared_patterns;
-} MpmPatternIdStore;
-
 /** \brief threshold ctx */
 typedef struct ThresholdCtx_    {
     SCMutex threshold_table_lock;                   /**< Mutex for hash table */
@@ -606,9 +597,6 @@ typedef struct DetectEngineCtx_ {
     /* specify the configuration for mpm context factory */
     uint8_t sgh_mpm_context;
 
-    /** hash table for looking up patterns for
-     *  id sharing and id tracking. */
-    MpmPatternIdStore *mpm_pattern_id_store;
     uint32_t max_fp_id;
 
     MpmCtxFactoryContainer *mpm_ctx_factory_container;