From 7acf67f489270f04d337b270a49d286de30c7704 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Mon, 13 Apr 2009 23:50:49 +0000
Subject: [PATCH] Fix WARNS=4 (-Wcast-qual -Wextra)

---
 usr.bin/tr/str.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 6eb4cfb36407..052e2b34ee2a 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.c,v 1.11 2007/01/17 00:21:44 hubertf Exp $	*/
+/*	$NetBSD: str.c,v 1.12 2009/04/13 23:50:49 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: str.c,v 1.11 2007/01/17 00:21:44 hubertf Exp $");
+__RCSID("$NetBSD: str.c,v 1.12 2009/04/13 23:50:49 lukem Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -148,24 +148,24 @@ bracket(s)
 }
 
 typedef struct {
-	char *name;
+	const char *name;
 	int (*func) __P((int));
 	int *set;
 } CLASS;
 
 static CLASS classes[] = {
-	{ "alnum",  isalnum,  },
-	{ "alpha",  isalpha,  },
-	{ "blank",  isblank,  },
-	{ "cntrl",  iscntrl,  },
-	{ "digit",  isdigit,  },
-	{ "graph",  isgraph,  },
-	{ "lower",  islower,  },
-	{ "print",  isprint,  },
-	{ "punct",  ispunct,  },
-	{ "space",  isspace,  },
-	{ "upper",  isupper,  },
-	{ "xdigit", isxdigit, },
+	{ "alnum",  isalnum,  NULL, },
+	{ "alpha",  isalpha,  NULL, },
+	{ "blank",  isblank,  NULL, },
+	{ "cntrl",  iscntrl,  NULL, },
+	{ "digit",  isdigit,  NULL, },
+	{ "graph",  isgraph,  NULL, },
+	{ "lower",  islower,  NULL, },
+	{ "print",  isprint,  NULL, },
+	{ "punct",  ispunct,  NULL, },
+	{ "space",  isspace,  NULL, },
+	{ "upper",  isupper,  NULL, },
+	{ "xdigit", isxdigit, NULL, },
 };
 
 static void
@@ -198,7 +198,7 @@ static int
 c_class(a, b)
 	const void *a, *b;
 {
-	return (strcmp(((CLASS *)a)->name, ((CLASS *)b)->name));
+	return (strcmp(((const CLASS *)a)->name, ((const CLASS *)b)->name));
 }
 
 /*