utils: make ZZ_DECODE an inline function, to ensure cast

Pierre-Alexandre Meyer · Pierre-Alexandre Meyer · commit e95569a9a2e5 · 2011-07-21T17:11:24.000-07:00
Signed-off-by: Pierre-Alexandre Meyer &lt;pierre@ning.com&gt;
diff --git a/c/src/smile_decode.c b/c/src/smile_decode.c
@@ -210,7 +210,7 @@ void smile_decode_value(u8** orig_data, struct content_handler* handler)
         handler->start_value();
         (*orig_data)++;
         ip++;
-        handler->number_value(ZZ_DECODE(*ip & 0x1F));
+        handler->number_value(zz_decode(*ip & 0x1F));
         handler->end_value();
     // Misc; binary / text / structure markers
     } else {
diff --git a/c/src/smile_decode.h b/c/src/smile_decode.h
@@ -4,24 +4,6 @@
 #include "api.h"
 
 #define DEBUG_BYTE(byte) printf("0x%02x ", (u8) byte);
-#define PRINT(ip, length) while (length--) {putchar(*ip++);}
-#define PRINT_EOK putchar(':'); putchar(' ');
-#define PRINT_INDENT printf("%-*s", indent, " ");
-
-#define PRINT_STRING_VALUE(ip, length) \
-    putchar('"'); \
-    PRINT(ip, length) \
-    putchar('"');
-
-#define PRINT_STRING_KEY(ip, length) \
-    PRINT_INDENT \
-    PRINT_STRING_VALUE(ip, length)
-
-#define PRINT_INT_VALUE(ip) \
-    printf("%d", ZZ_DECODE(ip));
-
-#define PRINT_LONG_VALUE(ip) \
-    printf("%lu", ZZ_DECODE(ip));
 
 #define SUCCESS 0
 
diff --git a/c/src/smile_utils.c b/c/src/smile_utils.c
@@ -16,9 +16,14 @@
 
 #include "smile_utils.h"
 
+inline long zz_decode(unsigned long n)
+{
+    return ((n >> 1) ^ (-(n & 1)));
+}
+
 long zzvarint_decode(u8 **msg)
 {
-    return ZZ_DECODE(varint_decode(msg));
+    return zz_decode(varint_decode(msg));
 }
 
 unsigned long varint_decode(u8 **msg)
diff --git a/c/src/smile_utils.h b/c/src/smile_utils.h
@@ -3,8 +3,7 @@
 
 #include "api.h"
 
-#define ZZ_DECODE(n) ((n >> 1) ^ (-(n & 1)))
-
+inline long zz_decode(unsigned long);
 long zzvarint_decode(u8**);
 unsigned long varint_decode(u8**);
 unsigned long varint_decode_buffer(u8*);
diff --git a/c/test/test_varint.c b/c/test/test_varint.c
@@ -43,17 +43,17 @@ void test_number_encoding()
     // 0x 0111 1100 1010 0000
     //     111 1100  010 0000
     //      11 1110 0010 0000
-    ASSERT_EQUAL(8080, ZZ_DECODE(varint_decode_buffer(&buf)));
+    ASSERT_EQUAL(8080, zz_decode(varint_decode_buffer(&buf)));
 }
 
 void test_zigzag()
 {
-    ASSERT_EQUAL(0, ZZ_DECODE(0))
-    ASSERT_EQUAL(-1, ZZ_DECODE(1))
-    ASSERT_EQUAL(1, ZZ_DECODE(2))
-    ASSERT_EQUAL(-2, ZZ_DECODE(3))
-    ASSERT_EQUAL(2147483647, ZZ_DECODE(4294967294))
-    ASSERT_EQUAL(-2147483648, ZZ_DECODE(4294967295))
+    ASSERT_EQUAL(0, zz_decode(0))
+    ASSERT_EQUAL(-1, zz_decode(1))
+    ASSERT_EQUAL(1, zz_decode(2))
+    ASSERT_EQUAL(-2, zz_decode(3))
+    ASSERT_EQUAL(2147483647, zz_decode(4294967294))
+    ASSERT_EQUAL(-2147483648, zz_decode(4294967295))
 }
 
 void test_varint()

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,14 @@`
`16`	`16`
`17`	`17`	`#include "smile_utils.h"`
`18`	`18`
	`19`	`+inline long zz_decode(unsigned long n)`
	`20`	`+{`
	`21`	`+ return ((n >> 1) ^ (-(n & 1)));`
	`22`	`+}`
	`23`	`+`
`19`	`24`	`long zzvarint_decode(u8 **msg)`
`20`	`25`	`{`
`21`		`- return ZZ_DECODE(varint_decode(msg));`
	`26`	`+ return zz_decode(varint_decode(msg));`
`22`	`27`	`}`
`23`	`28`
`24`	`29`	`unsigned long varint_decode(u8 **msg)`