tests/example_exec.c: Sort environment variables.

[coloredstderr/coloredstderr.git] / src / debug.h

diff --git a/src/debug.h b/src/debug.h
index 7425ce475f8c49f475f4dba01d48408ee65f547b..911a440fb0f83feb30c039351cd2216a81958c28 100644 (file)
--- a/src/debug.h
+++ b/src/debug.h
@@ -24,8 +24,10 @@ static void debug_write(int fd, int first_call, char const *format, va_list ap)
     char buffer[1024];
 
     int written = vsnprintf(buffer, sizeof(buffer), format, ap);
+    if (written < 0) {
+        return; /* shouldn't happen */
     /* Overflow. */
-    if ((size_t)written >= sizeof(buffer)) {
+    } else if ((size_t)written >= sizeof(buffer)) {
         written = sizeof(buffer) - 1;
     }
 
@@ -34,13 +36,14 @@ static void debug_write(int fd, int first_call, char const *format, va_list ap)
     DLSYM_FUNCTION(real_close, "close");
 
     if (first_call) {
-        char nl = '\n';
+        char const nl = '\n';
         real_write(fd, &nl, 1);
     }
     real_write(fd, buffer, (size_t)written);
     real_close(fd);
 }
 
+#ifdef DEBUG
 static void debug(char const *format, ...) {
     va_list ap;
 
@@ -63,6 +66,7 @@ static void debug(char const *format, ...) {
 
     errno = saved_errno;
 }
+#endif
 
 static void warning(char const *format, ...) {
     va_list ap;