@@ -1,3 +1,10 @@

+Fri Feb 15 22:31:57 EET 2008 (edwin)

+------------------------------------

+  * libclamav/others.[ch]: replace cli_dbgmsg with a macro that avoids calling

+			the real function if we're not debugging. Statically

+			predict this branch as untaken.

+  * libclamav/upack.c, libclamav.map: update due to above change

+

 Fri Feb 15 18:24:22 CET 2008 (tk)

 ---------------------------------

   * clamd: delay the call to daemonize() (bb#839)

@@ -45,7 +45,8 @@ CLAMAV_PRIVATE {

     cli_calloc;

     cli_ole2_extract;

     cli_errmsg;

-    cli_dbgmsg;

+    cli_debug_flag;

+    cli_dbgmsg_internal;

     cli_vba_readdir;

     cli_vba_inflate;

     cli_ppt_vba_read;

@@ -117,11 +117,9 @@ void cli_errmsg(const char *str, ...)

     MSGCODE("LibClamAV Error: ");

 }

-void cli_dbgmsg(const char *str, ...)

+void cli_dbgmsg_internal(const char *str, ...)

 {

-    if(cli_debug_flag) {

-	MSGCODE("LibClamAV debug: ");

-    }

+    MSGCODE("LibClamAV debug: ");

 }

 #ifndef CLI_MEMFUNSONLY

@@ -209,10 +209,20 @@ void cli_errmsg(const char *str, ...) __attribute__((format(printf, 1, 2)));

 void cli_errmsg(const char *str, ...);

 #endif

+/* tell compiler about branches that are very rarely taken,

+ * such as debug paths, and error paths */

+#if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)

+#define UNLIKELY(cond) __builtin_expect(!!(cond), 0)

+#else

+#define UNLIKELY(cond) (cond)

+#endif

+

+#define cli_dbgmsg if(UNLIKELY(cli_debug_flag)) cli_dbgmsg_internal

+

 #ifdef __GNUC__

-void cli_dbgmsg(const char *str, ...) __attribute__((format(printf, 1, 2)));

+void cli_dbgmsg_internal(const char *str, ...) __attribute__((format(printf, 1, 2)));

 #else

-void cli_dbgmsg(const char *str, ...);

+void cli_dbgmsg_internal(const char *str, ...);

 #endif

 void *cli_malloc(size_t nmemb);

@@ -446,9 +446,10 @@ int unupack399(char *bs, uint32_t bl, uint32_t init_eax, char *init_ebx, uint32_

 	p.p2 = cli_readint32(init_ebx + 4);

 	cli_dbgmsg("\n\tp0: %p\n\tp1: %08x\n\tp2: %08x\n", p.p0, p.p1, p.p2);

-	for (i = 0; i<6; i++)

-		state[i] = cli_readint32(loc_ebx + (i<<2)),

+	for (i = 0; i<6; i++) {

+		state[i] = cli_readint32(loc_ebx + (i<<2));

 		cli_dbgmsg("state[%d] = %08x\n", i, state[i]);

+	}

 	do {

 		loc_eax = eax_copy;

 		loc_edx = loc_ebx + (loc_eax<<2) + 0x58;