Changeset 1688 for zzufTweet

Timestamp:

Jan 17, 2007, 4:31:40 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Improved %c usage in our custom fprintf() implementation.

Location:

zzuf/trunk/src

Files:

• debug.c (modified) (1 diff)
• lib-stream.c (modified) (3 diffs)

zzuf/trunk/src/debug.c

@@ -84 +84 @@
             if(i >= 0x20 && i < 0x7f)
                 write(fd, &i, 1);
+            else if(i == '\n')
+                write(fd, "\\n", 2);
+            else if(i == '\t')
+                write(fd, "\\t", 2);
+            else if(i == '\r')
+                write(fd, "\\r", 2);
             else
             {

zzuf/trunk/src/lib-stream.c

@@ -288 +288 @@
         _zz_disabled = 0; \
         FGETC_FUZZ \
-        if(ret >= 0x20 && ret <= 0x7f) \
-            debug("%s([%i]) = 0x%02x '%c'", __func__, fd, ret, (char)ret); \
-        else \
-            debug("%s([%i]) = 0x%02x", __func__, fd, ret); \
+        debug("%s([%i]) = '%c'", __func__, fd, ret); \
     } while(0)
 
@@ -394 +391 @@
 #endif
 
-    if(ret >= 0x20 && ret <= 0x7f)
-        debug("%s(0x%02x, [%i]) = 0x%02x '%c'", __func__, c, fd, ret, ret);
-    else
-        debug("%s(0x%02x, [%i]) = 0x%02x", __func__, c, fd, ret);
+    debug("%s(0x%02x, [%i]) = '%c'", __func__, c, fd, ret);
     return ret;
 }
@@ -467 +461 @@
         } \
         if(need_delim) \
-            debug("%s(%p, %p, 0x%02x, [%i]) = %li", __func__, \
+            debug("%s(%p, %p, '%c', [%i]) = %li", __func__, \
                   lineptr, n, delim, fd, (long int)ret); \
         else \