From: Timo Sirainen <tss@iki.fi>
Date: Fri, 11 Jun 2010 23:35:32 +0000 (+0100)
Subject: MODULE_CONTEXT() now avoids directly returning NULL to make static analyzer happier.
X-Git-Tag: 2.0.beta6~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=398b08ea29e1851ad7f8772d0d79418b9ee25a34;p=thirdparty%2Fdovecot%2Fcore.git

MODULE_CONTEXT() now avoids directly returning NULL to make static analyzer happier.

--HG--
branch : HEAD
---

diff --git a/src/lib/module-context.h b/src/lib/module-context.h
index 2603cf06f7..5c0738a653 100644
--- a/src/lib/module-context.h
+++ b/src/lib/module-context.h
@@ -46,10 +46,9 @@
 	COMPILE_ERROR_IF_TYPES_NOT_COMPATIBLE(OBJ_REGISTER(obj), (id_ctx).reg)
 
 #define MODULE_CONTEXT(obj, id_ctx) \
-	(unlikely(!(id_ctx).id.module_id_set) ? NULL : \
 	(*((void **)array_idx_modifiable(&(obj)->module_contexts, \
-					(id_ctx).id.module_id) + \
-	 OBJ_REGISTER_COMPATIBLE(obj, id_ctx))))
+		module_get_context_id(&(id_ctx).id)) + \
+	 OBJ_REGISTER_COMPATIBLE(obj, id_ctx)))
 
 #ifdef HAVE_TYPEOF
 #  define MODULE_CONTEXT_DEFINE(_name, _reg) \