completely remove populate_mpm_flags. Some indentation changes. Also disable support to avoid double checks inside payload inspection for patterns added to mpm. Also add support to MpmFactory to reclaim a mpm_ctx

src/util-mpm.c

@@ -180,6 +180,14 @@ MpmCtx *MpmFactoryGetMpmCtxForProfile(int32_t id)
     }
 }
 
+void MpmFactoryReClaimMpmCtx(MpmCtx *mpm_ctx)
+{
+    if (!MpmFactoryIsMpmCtxAvailable(mpm_ctx))
+        free(mpm_ctx);
+
+    return;
+}
+
 void MpmFactoryDeRegisterAllMpmCtxProfiles(void)
 {
     if (mpm_ctx_factory_container == NULL)

src/util-mpm.h

@@ -172,7 +172,8 @@ typedef struct MpmTableElmt_ {
 
 MpmTableElmt mpm_table[MPM_TABLE_SIZE];
 
-int32_t MpmFactoryRegisterMpmCtxProfile(const char *, uint8_t flags);
+int32_t MpmFactoryRegisterMpmCtxProfile(const char *, uint8_t);
+void MpmFactoryReClaimMpmCtx(MpmCtx *);
 MpmCtx *MpmFactoryGetMpmCtxForProfile(int32_t);
 void MpmFactoryDeRegisterAllMpmCtxProfiles(void);
 int32_t MpmFactoryIsMpmCtxAvailable(MpmCtx *);