@@ -369,6 +369,10 @@ static int cli_hashtab_grow(struct cli_hashtable *s)

 	return CL_SUCCESS;

 }

+#ifndef USE_MPOOL

+#define cli_htu32_grow(A, B) cli_htu32_grow(A)

+#endif

+

 static int cli_htu32_grow(struct cli_htu32 *s, mpool_t *mempool)

 {

 	const size_t new_capacity = nearest_power(s->capacity + 1);

@@ -104,6 +104,11 @@ struct cli_htu32 {

     STRUCT_PROFILE

 };

+#ifndef USE_MPOOL

+#define cli_htu32_init(A, B, C) cli_htu32_init(A, B)

+#define cli_htu32_insert(A, B, C) cli_htu32_insert(A, B)

+#define cli_htu32_free(A, B) cli_htu32_free(A)

+#endif

 int cli_htu32_init(struct cli_htu32 *s, size_t capacity, mpool_t *mempool);

 int cli_htu32_insert(struct cli_htu32 *s, const struct cli_htu32_element *item, mpool_t *mempool);

 const struct cli_htu32_element *cli_htu32_find(const struct cli_htu32 *s, uint32_t key);

@@ -48,7 +48,6 @@ struct cli_hash_patt {

     struct cli_htu32 sizehashes[CLI_HASH_AVAIL_TYPES];

 };

-

 int hm_addhash(struct cli_matcher *root, const char *hash, uint32_t size, const char *virusname);

 void hm_flush(struct cli_matcher *root);

 int cli_hm_scan(const unsigned char *digest, uint32_t size, const char **virname, const struct cli_matcher *root, enum CLI_HASH_TYPE type);

@@ -1954,7 +1954,9 @@ static int cli_loadhash(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 		ret = CL_EMEM;

 		break;

 	    }

+#ifdef USE_MPOOL

 	    db->mempool = engine->mempool;

+#endif

 	    if(mode == MD5_HDB)

 		engine->hm_hdb = db;

 	    else if(mode == MD5_MDB)