Refactoring cache_remove to engine instead of full context object

libclamav/cache.c

@@ -768,21 +768,21 @@ void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx) {
 }
 
 /* Removes a hash from the cache */
-void cache_remove(unsigned char *md5, size_t size, cli_ctx *ctx) {
+void cache_remove(unsigned char *md5, size_t size, const struct cl_engine *engine) {
     unsigned int key = getkey(md5);
     struct CACHE *c;
 
-    if(!ctx || !ctx->engine || !ctx->engine->cache)
+    if(engine || !engine->cache)
        return;
 
-    c = &ctx->engine->cache[key];
+    c = &engine->cache[key];
     if(pthread_mutex_lock(&c->mutex)) {
 	cli_errmsg("cli_add: mutex lock fail\n");
 	return;
     }
 
 #ifdef USE_LRUHASHCACHE
-    cacheset_remove(&c->cacheset, md5, size, ctx->engine->mempool);
+    cacheset_remove(&c->cacheset, md5, size, engine->mempool);
 #else
 #ifdef USE_SPLAY
     cacheset_remove(&c->cacheset, md5, size);

libclamav/cache.h

@@ -25,6 +25,8 @@
 #include "others.h"
 
 void cache_add(unsigned char *md5, size_t size, cli_ctx *ctx);
+/* Removes a hash from the cache */
+void cache_remove(unsigned char *md5, size_t size, const struct cl_engine *engine);
 int cache_check(unsigned char *hash, cli_ctx *ctx);
 int cli_cache_init(struct cl_engine *engine);
 void cli_cache_destroy(struct cl_engine *engine);