From: John Hodge <tpg@mutabah.net>
Date: Mon, 3 Feb 2014 05:25:12 +0000 (+0800)
Subject: Kernel - Fix ASSERTRV macro supplying too many arguments to Warning
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=31289899305d3530c2be27a81665eaf258787a5a;hp=3bbdda25a43af7c2c97719ff7ebd9fd2187ae272;p=tpg%2Facess2.git

Kernel - Fix ASSERTRV macro supplying too many arguments to Warning
---

diff --git a/KernelLand/Kernel/include/logdebug.h b/KernelLand/Kernel/include/logdebug.h
index 987a6a89..0710c6bc 100644
--- a/KernelLand/Kernel/include/logdebug.h
+++ b/KernelLand/Kernel/include/logdebug.h
@@ -64,7 +64,7 @@ extern void	Debug_HexDump(const char *Header, const void *Data, size_t Length);
 #endif
 #if !DISABLE_ASSERTS
 # define ASSERTV(expr,msg,args...) do{if(!(expr))Panic("%s:%i - %s: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__,##args);}while(0)
-# define ASSERTRV(expr,rv,msg,args...)	do{if(!(expr)){Warning("%s:%i: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__ , ##args);return rv;}}while(0)
+# define ASSERTRV(expr,rv,msg,args...)	do{if(!(expr)){Warning("%s:%i - %s: Assertion '"#expr"' failed"msg,__FILE__,__LINE__,(char*)__func__ , ##args);return rv;}}while(0)
 #else
 # define ASSERTV(expr)
 # define ASSERTRV(expr)