diff options
Diffstat (limited to 'usr.bin/tr/str.c')
-rw-r--r-- | usr.bin/tr/str.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index a9dccde..e1e1768 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -29,14 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#ifndef lint -#if 0 -static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95"; -#endif -__RCSID("$NetBSD: str.c,v 1.30 2018/05/26 11:20:30 leot Exp $"); -#endif /* not lint */ - #include <sys/types.h> #include <err.h> @@ -229,6 +221,7 @@ static const CLASS classes[] = { { "upper", isupper }, { "xdigit", isxdigit }, }; +const int classes_len = 12; typedef struct { const char *name; @@ -247,7 +240,7 @@ genclass(const char *class, size_t len) /* Find the class */ key.name = class; key.len = len; - cp = bsearch(&key, classes, __arraycount(classes), sizeof(classes[0]), + cp = bsearch(&key, classes, classes_len, sizeof(classes[0]), c_class); if (cp == NULL) { errx(1, "unknown class %.*s", (int)len, class); |