Changeset 1735 for zzuf/trunk/src/debug.cTweet

Timestamp:

Feb 2, 2007, 12:29:27 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fixed a minor warning and commented our printf-like function.

File:

• zzuf/trunk/src/debug.c (modified) (4 diffs)

zzuf/trunk/src/debug.c

@@ -18 +18 @@
 
 #include "config.h"
-
-/* Do we want our debug() call to be safe wrt. signals? */
-#define SAFE_FUNCTION
 
 #if defined HAVE_STDINT_H
@@ -53 +50 @@
             i /= base; \
         } \
-        write(fd, b + 1, buf + 127 - b); \
+        write(fd, b + 1, (int)(buf + 127 - b)); \
     } while(0)
 
 void _zz_debug(char const *format, ...)
 {
-#ifdef SAFE_FUNCTION
     static char const *hex2char = "0123456789abcdef";
     char const *f;
-#endif
     va_list args;
     int saved_errno;
@@ -70 +65 @@
     saved_errno = errno;
     va_start(args, format);
-#ifdef SAFE_FUNCTION
+
+#if 0
+    /* This function's code is equivalent to the following *printf calls,
+     * except it only uses signal-safe functions */
+    fprintf(stderr, "** zzuf debug ** ");
+    vfprintf(stderr, format, args);
+    fprintf(stderr, "\n");
+#endif
+
     write(_zz_debugfd, "** zzuf debug ** ", 17);
     for(f = format; *f; f++)
@@ -161 +164 @@
     }
     write(_zz_debugfd, "\n", 1);
-#else
-    fprintf(stderr, "** zzuf debug ** ");
-    vfprintf(stderr, format, args);
-    fprintf(stderr, "\n");
-#endif
     va_end(args);
     errno = saved_errno;
 }
-