Changeset 4673

Timestamp:

10/06/10 23:31:40 (3 years ago)

Author:

sam

Message:

Fix a bug in the %i formatting and implement %S.

Location:

zzuf/trunk/src/libzzuf

Files:

• debug.c (modified) (2 diffs)
• lib-win32.c (modified) (1 diff)

zzuf/trunk/src/libzzuf/debug.c

@@ -47 +47 @@
         char buf[128], *b = buf + 127; \
         if (i <= 0) \
-            append((i = -i) ? "-" : "0", 1); /* XXX: hack here */ \
-        if (i <= 0) \
+            append((i = 1 + ~i) ? "-" : "0", 1); /* XXX: hack here */ \
+        if (i < 0) \
         { \
-            i = -(i + base); /* XXX: special case for INT_MIN */ \
+            i = 1 + ~(i + base); /* XXX: special case for INT_MIN */ \
             *b-- = hex2char[i % base]; \
             i = i / base + 1; \
@@ -212 +212 @@
             }
         }
+        else if(f[0] == 'S')
+        {
+            uint16_t *s = va_arg(args, uint16_t *);
+            if(!s)
+                append("(nil)", 5);
+            else
+            {
+                int l = 0;
+                while(s[l])
+                {
+                    if (s[l] < 128)
+                    {
+                        char tmp = (char)s[l];
+                        append(&tmp, 1);
+                    }
+                    else
+                    {
+                        append("\\u", 2);
+                        append(hex2char + ((s[l] & 0xf000) >> 12), 1);
+                        append(hex2char + ((s[l] & 0xf00) >> 8), 1);
+                        append(hex2char + ((s[l] & 0xf0) >> 4), 1);
+                        append(hex2char + (s[l] & 0xf), 1);
+                    }
+                    l++;
+                }
+            }
+        }
         else if(f[0] == '0' && f[1] == '2' && f[2] == 'x')
         {

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -86 +86 @@
                             lpSecurityAttributes, dwCreationDisposition,
                             dwFlagsAndAttributes, hTemplateFile);
-    debug("CreateFileW(\"%s\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
+    debug("CreateFileW(\"%S\", 0x%x, 0x%x, ..., 0x%x, 0x%x, ...) = [%i]",
           lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition,
           dwFlagsAndAttributes, (int)ret);