colorize 0.56

[colorize.git] / colorize.c

diff --git a/colorize.c b/colorize.c
index 9328be0041aab0bde93c44b09fb2f1c35a00dda7..abeb665f474bf2de57789a3b784686cadafbc543 100644 (file)
--- a/colorize.c
+++ b/colorize.c
@@ -108,7 +108,7 @@
 
 #define DEBUG_FILE "debug.txt"
 
-#define VERSION "0.55"
+#define VERSION "0.56"
 
 typedef enum { false, true } bool;
 
@@ -165,14 +165,14 @@ enum fmts {
     FMT_TYPE
 };
 static const char *formats[] = {
-    "%s",                    /* generic */
-    "%s '%s'",               /* string  */
-    "%s `%s' %s",            /* quote   */
-    "%s color '%s' %s",      /* color   */
-    "%s color '%s' %s '%s'", /* random  */
-    "less than %u bytes %s", /* error   */
-    "%s: %s",                /* file    */
-    "%s: %s: %s",            /* type    */
+    "%s",                     /* generic */
+    "%s '%s'",                /* string  */
+    "%s `%s' %s",             /* quote   */
+    "%s color '%s' %s",       /* color   */
+    "%s color '%s' %s '%s'",  /* random  */
+    "less than %lu bytes %s", /* error   */
+    "%s: %s",                 /* file    */
+    "%s: %s: %s",             /* type    */
 };
 
 enum { FOREGROUND, BACKGROUND };
@@ -186,18 +186,18 @@ static const struct {
     { bg_colors, sizeof (bg_colors) / sizeof (struct color), "background" },
 };
 
-static FILE *stream = NULL;
+static FILE *stream;
 #if DEBUG
-static FILE *log = NULL;
+static FILE *log;
 #endif
 
-static unsigned int stacked_vars = 0;
-static void **vars_list = NULL;
+static unsigned int stacked_vars;
+static void **vars_list;
 
-static bool clean = false;
-static bool clean_all = false;
+static bool clean;
+static bool clean_all;
 
-static char *exclude = NULL;
+static char *exclude;
 
 static const char *program_name;
 
@@ -253,7 +253,7 @@ static void release_var (void **, unsigned int, void **);
 extern char *optarg;
 extern int optind;
 
-static int opt_type = 0;
+static int opt_type;
 
 int
 main (int argc, char **argv)
@@ -916,7 +916,7 @@ print_text (const char *p, size_t len)
     size_t bytes_written;
     bytes_written = fwrite (p, 1, len, stdout);
     if (bytes_written != len)
-      vfprintf_fail (formats[FMT_ERROR], len, "written");
+      vfprintf_fail (formats[FMT_ERROR], (unsigned long)len, "written");
 }
 
 static bool