From 65ed4ca07bd18c2038b5863ed1e18d3bfc8e696d Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 17 May 2009 12:47:24 +0200 Subject: [PATCH] build: tr: avoid a warning due to newer gcc's -Wenum-compare * src/tr.c (N_CHAR_CLASSES): Remove anonymous enum definition. (look_up_char_class): Use ARRAY_CARDINALITY, rather than N_CHAR_CLASSES. --- src/tr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tr.c b/src/tr.c index f4b531731..e9338d48f 100644 --- a/src/tr.c +++ b/src/tr.c @@ -1,5 +1,5 @@ /* tr -- a filter to translate characters - Copyright (C) 91, 1995-2008 Free Software Foundation, Inc. + Copyright (C) 91, 1995-2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -246,7 +246,6 @@ static char const *const char_class_name[] = "alnum", "alpha", "blank", "cntrl", "digit", "graph", "lower", "print", "punct", "space", "upper", "xdigit" }; -enum { N_CHAR_CLASSES = sizeof char_class_name / sizeof char_class_name[0] }; /* Array of boolean values. A character `c' is a member of the squeeze set if and only if in_squeeze_set[c] is true. The squeeze @@ -547,7 +546,7 @@ look_up_char_class (char const *class_str, size_t len) { enum Char_class i; - for (i = 0; i < N_CHAR_CLASSES; i++) + for (i = 0; i < ARRAY_CARDINALITY (char_class_name); i++) if (strncmp (class_str, char_class_name[i], len) == 0 && strlen (char_class_name[i]) == len) return i; -- 2.11.4.GIT