X-Git-Url: http://git.refcnt.org/?p=colorize.git;a=blobdiff_plain;f=colorize.c;h=1d83781d6df5ff3fb636312aca4fd24f81753bd5;hp=b9e5c49fb77336286d5e44ab047dc61204c75757;hb=aa263791f3e5e06ffd46621fdf9132921f8911a5;hpb=5be3a186ada0999715b15e82fe401e82c96496c8 diff --git a/colorize.c b/colorize.c index b9e5c49..1d83781 100644 --- a/colorize.c +++ b/colorize.c @@ -73,7 +73,7 @@ #define LF 0x01 #define CR 0x02 -#define SKIP_LINE_ENDINGS(flags) (((flags) & CR) && ((flags) & LF) ? 2 : 1) +#define SKIP_LINE_ENDINGS(flags) ((flags) == (CR|LF) ? 2 : 1) #define VALID_FILE_TYPE(mode) (S_ISREG (mode) || S_ISLNK (mode) || S_ISFIFO (mode)) @@ -122,7 +122,7 @@ #define MAX_ATTRIBUTE_CHARS (6 * 2) -#define VERSION "0.62" +#define VERSION "0.63" typedef enum { false, true } bool; @@ -1448,8 +1448,8 @@ has_color_name (const char *str, const char *name) { char *p; - assert (strlen (str)); - assert (strlen (name)); + assert (strlen (str) > 0); + assert (strlen (name) > 0); if (!(*str == *name || *str == toupper (*name))) return false;