X-Git-Url: http://git.refcnt.org/?a=blobdiff_plain;f=colorize.c;h=ff346b0c25e35bacd3707f1d8b784b57e004d0fb;hb=7ee1a09534edb8d84d3172413066d7a76edd0291;hp=a443368c7b66148842b3b406d143e56826d89381;hpb=ae871d0d8e5fdd1a49f0bc4192cdc1e750dd0453;p=colorize.git

diff --git a/colorize.c b/colorize.c
index a443368..ff346b0 100644
--- a/colorize.c
+++ b/colorize.c
@@ -116,11 +116,13 @@
 # define COLOR_SEP_CHAR '/'
 #endif
 
-#define DEBUG_FILE "debug.txt"
+#if DEBUG
+# define DEBUG_FILE "debug.txt"
+#endif
 
-#define MAX_ATTRIBUTE_CHARS (5 * 2)
+#define MAX_ATTRIBUTE_CHARS (6 * 2)
 
-#define VERSION "0.61"
+#define VERSION "0.62"
 
 typedef enum { false, true } bool;
 
@@ -164,7 +166,7 @@ struct bytes_size {
     char unit;
 };
 
-enum fmts {
+enum {
     FMT_GENERIC,
     FMT_STRING,
     FMT_QUOTE,
@@ -188,7 +190,7 @@ static const char *formats[] = {
 enum { GENERIC, FOREGROUND = 0, BACKGROUND };
 
 static const struct {
-    struct color const *entries;
+    const struct color *entries;
     unsigned int count;
     const char *desc;
 } tables[] = {
@@ -474,6 +476,7 @@ process_opt_attr (const char *p)
                 strncpy (attr_invalid, s, p - s);
                 attr_invalid[p - s] = '\0';
                 vfprintf_fail ("--attr switch attribute '%s' is not valid", attr_invalid);
+                RELEASE_VAR (attr_invalid); /* never reached */
               }
           }
         if (*p)
@@ -538,13 +541,11 @@ print_help (void)
         const char *short_opt = NULL;
         unsigned int i;
         for (i = 0; i < sizeof (short_opts) / sizeof (struct short_opt); i++)
-          {
-            if (streq (opt->name, short_opts[i].name))
-              {
-                short_opt = short_opts[i].short_opt;
-                break;
-              }
-          }
+          if (streq (opt->name, short_opts[i].name))
+            {
+              short_opt = short_opts[i].short_opt;
+              break;
+            }
         if (short_opt)
           printf ("\t\t-%s, --%s\n", short_opt, opt->name);
         else
@@ -694,6 +695,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, char *attr, const struct
       }
 
     find_color_entries (color_names, colors);
+    assert (colors[FOREGROUND] != NULL);
     free_color_names (color_names);
 
     if (!colors[FOREGROUND]->code && colors[BACKGROUND] && colors[BACKGROUND]->code)
@@ -702,6 +704,7 @@ process_args (unsigned int arg_cnt, char **arg_strings, char *attr, const struct
         color_name.name = color_name.orig = "default";
 
         find_color_entry (&color_name, FOREGROUND, colors);
+        assert (colors[FOREGROUND]->code != NULL);
       }
 
     process_file_arg (file_string, file, stream);