Changeset 1551Tweet

Timestamp:

01/03/07 23:12:02 (6 years ago)

Author:

sam

Message:

• Better debug messages in load-stream.c.

File:

• zzuf/trunk/src/load-stream.c (modified) (8 diffs)

zzuf/trunk/src/load-stream.c

@@ -101 +101 @@
             int fd = fileno(ret); \
             _zz_register(fd); \
-            debug(STR(fn) "(\"%s\", \"%s\") = %p", path, mode, ret); \
+            debug(STR(fn) "(\"%s\", \"%s\") = [%i]", path, mode, fd); \
         } \
     } while(0)
@@ -128 +128 @@
 
     ret = fseek_orig(stream, offset, whence);
-    debug("fseek(%p, %li, %i) = %i", stream, offset, whence, ret);
+    debug("fseek([%i], %li, %i) = %i", fd, offset, whence, ret);
     if(ret != 0)
         return ret;
@@ -161 +161 @@
     pos = ftell(stream);
     ret = fread_orig(ptr, size, nmemb, stream);
-    debug("fread(%p, %li, %li, %p) = %li",
-          ptr, (long int)size, (long int)nmemb, stream, (long int)ret);
+    debug("fread(%p, %li, %li, [%i]) = %li",
+          ptr, (long int)size, (long int)nmemb, fd, (long int)ret);
     if(ret >= 0)
     {
@@ -190 +190 @@
             ret = ch; \
         } \
-        debug(STR(fn)"(%p) = 0x%02x", stream, ret); \
+        if(ret >= 0x20 && ret <= 0x7f) \
+            debug(STR(fn)"([%i]) = 0x%02x '%c'", fd, ret, (char)ret); \
+        else \
+            debug(STR(fn)"([%i]) = 0x%02x", fd, ret); \
     } while(0)
 
@@ -242 +245 @@
     }
 
-    debug("fgets(%p, %i, %p) = %p", s, size, stream, ret);
+    debug("fgets(%p, %i, [%i]) = %p", s, size, fd, ret);
     return ret;
 }
@@ -264 +267 @@
     else
         _zz_addpos(fd, 1); /* revert what we did */
-    debug("ungetc(0x%02x, %p) = 0x%02x", c, stream, ret);
+    if(ret >= 0x20 && ret <= 0x7f)
+        debug("ungetc(0x%02x, [%i]) = 0x%02x '%c'", c, fd, ret, ret);
+    else
+        debug("ungetc(0x%02x, [%i]) = 0x%02x", c, fd, ret);
     return ret;
 }
@@ -279 +285 @@
 
     ret = fclose_orig(fp);
-    debug("fclose(%p) = %i", fp, ret);
+    debug("fclose([%i]) = %i", fd, ret);
     _zz_unregister(fd);
 
@@ -330 +336 @@
         } \
         if(need_delim) \
-            debug(STR(fn) "(%p, %p, 0x%02x, %p) = %li", \
-                  lineptr, n, delim, stream, (long int)ret); \
+            debug(STR(fn) "(%p, %p, 0x%02x, [%i]) = %li", \
+                  lineptr, n, delim, fd, (long int)ret); \
         else \
-            debug(STR(fn) "(%p, %p, %p) = %li", \
-                  lineptr, n, stream, (long int)ret); \
+            debug(STR(fn) "(%p, %p, [%i]) = %li", \
+                  lineptr, n, fd, (long int)ret); \
         return ret; \
     } while(0)