From 46734ec41be6eb7121c3e1a5b71e2ae245ce8640 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 13 Oct 2015 10:39:54 +0200
Subject: [PATCH] mpm: remove unused pmq merge function

---
 src/util-mpm.c | 16 ----------------
 src/util-mpm.h |  1 -
 2 files changed, 17 deletions(-)

diff --git a/src/util-mpm.c b/src/util-mpm.c
index 1c4fe42e8a..27f5a86c07 100644
--- 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 5cbdc9355b..209a3fddfd 100644
--- 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 *);
-- 
2.47.2