mpm: remove unused pmq merge function

diff --git a/src/util-mpm.c b/src/util-mpm.c
index 1c4fe42e8a8b8e366f58d49dbfa6ae7b7a4ac531..27f5a86c072f4b1ce395f60156cfdc54dd2f92bf 100644 (file)
--- a/src/util-mpm.c
+++ b/src/util-mpm.c
@@ -473,22 +473,6 @@ MpmAddSidsResize(PatternMatcherQueue *pmq, uint32_t new_size)
     return new_size;
 }
 
-/**
- *  \brief Merge two pmq's bitarrays
- *
- *  \param src source pmq
- *  \param dst destination pmq to merge into
- */
-void PmqMerge(PatternMatcherQueue *src, PatternMatcherQueue *dst)
-{
-    if (src->rule_id_array_cnt == 0)
-        return;
-
-    if (src->rule_id_array && dst->rule_id_array) {
-        MpmAddSids(dst, src->rule_id_array, src->rule_id_array_cnt);
-    }
-}
-
 /** \brief Reset a Pmq for reusage. Meant to be called after a single search.
  *  \param pmq Pattern matcher to be reset.
  *  \todo memset is expensive, but we need it as we merge pmq's. We might use

diff --git a/src/util-mpm.h b/src/util-mpm.h
index 5cbdc9355b7e1c70aaa016fc1eeb8dbc5b6c32b5..209a3fddfd679a517bd268f2e8fa10c5afaf895e 100644 (file)
--- a/src/util-mpm.h
+++ b/src/util-mpm.h
@@ -203,7 +203,6 @@ void MpmFactoryDeRegisterAllMpmCtxProfiles(struct DetectEngineCtx_ *);
 int32_t MpmFactoryIsMpmCtxAvailable(const struct DetectEngineCtx_ *, const MpmCtx *);
 
 int PmqSetup(PatternMatcherQueue *);
-void PmqMerge(PatternMatcherQueue *src, PatternMatcherQueue *dst);
 void PmqReset(PatternMatcherQueue *);
 void PmqCleanup(PatternMatcherQueue *);
 void PmqFree(PatternMatcherQueue *);