[Ocfs2-commits] manish commits r2170 - trunk/fs/ocfs2/cluster

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Date: 2005-04-22 21:12:55 -0500 (Fri, 22 Apr 2005)
New Revision: 2170

Modified:
   trunk/fs/ocfs2/cluster/masklog.h
Log:
Promote arg to unsigned long before casting to void *, reorder to put similar
types near each other.

Signed-off-by: mfasheh


Modified: trunk/fs/ocfs2/cluster/masklog.h
===================================================================
--- trunk/fs/ocfs2/cluster/masklog.h	2005-04-23 02:09:54 UTC (rev 2169)
+++ trunk/fs/ocfs2/cluster/masklog.h	2005-04-23 02:12:55 UTC (rev 2170)
@@ -187,22 +187,22 @@
 } while (0)
 
 #define mlog_exit(st) do {						     \
-	if (__builtin_types_compatible_p(typeof(st), long long))	     \
-		mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st));	     \
+	if (__builtin_types_compatible_p(typeof(st), void *))		     \
+		mlog(ML_EXIT, "EXIT: %p\n", (void *) (unsigned long) (st));  \
 	else if (__builtin_types_compatible_p(typeof(st), unsigned long))    \
 		mlog(ML_EXIT, "EXIT: %lu\n", (unsigned long) (st));	     \
-	else if (__builtin_types_compatible_p(typeof(st), long)) 	     \
-		mlog(ML_EXIT, "EXIT: %ld\n", (long) (st));		     \
+	else if (__builtin_types_compatible_p(typeof(st), signed long))      \
+		mlog(ML_EXIT, "EXIT: %ld\n", (signed long) (st));	     \
 	else if (__builtin_types_compatible_p(typeof(st), unsigned int)	     \
 		 || __builtin_types_compatible_p(typeof(st), unsigned short) \
 		 || __builtin_types_compatible_p(typeof(st), unsigned char)) \
 		mlog(ML_EXIT, "EXIT: %u\n", (unsigned int) (st));	     \
-	else if (__builtin_types_compatible_p(typeof(st), int)		     \
+	else if (__builtin_types_compatible_p(typeof(st), signed int)	     \
 		 || __builtin_types_compatible_p(typeof(st), signed short)   \
 		 || __builtin_types_compatible_p(typeof(st), signed char))   \
-		mlog(ML_EXIT, "EXIT: %d\n", (int) (st));		     \
-	else if (__builtin_types_compatible_p(typeof(st), void *))	     \
-		mlog(ML_EXIT, "EXIT: %p\n", (void *) (st));	  	     \
+		mlog(ML_EXIT, "EXIT: %d\n", (signed int) (st));		     \
+	else if (__builtin_types_compatible_p(typeof(st), long long))	     \
+		mlog(ML_EXIT, "EXIT: %lld\n", (long long) (st));	     \
 	else								     \
 		mlog(ML_EXIT, "EXIT: %llu\n", (unsigned long long) (st));    \
 } while (0)