Module Name: src
Committed By: dholland
Date: Sun Aug 11 00:05:49 UTC 2013
Modified Files:
src/usr.bin/tr: extern.h str.c tr.c
Log Message:
sprinkle const
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/tr/extern.h
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/tr/str.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/tr/tr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tr/extern.h
diff -u src/usr.bin/tr/extern.h:1.9 src/usr.bin/tr/extern.h:1.10
--- src/usr.bin/tr/extern.h:1.9 Sun Aug 11 00:04:14 2013
+++ src/usr.bin/tr/extern.h Sun Aug 11 00:05:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.9 2013/08/11 00:04:14 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.10 2013/08/11 00:05:49 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,5 +40,5 @@ typedef struct str STR;
STR *str_create(int);
void str_destroy(STR *);
-void str_setstring(STR *s, char *txt);
+void str_setstring(STR *s, const char *txt);
int next(STR *, int *);
Index: src/usr.bin/tr/str.c
diff -u src/usr.bin/tr/str.c:1.21 src/usr.bin/tr/str.c:1.22
--- src/usr.bin/tr/str.c:1.21 Sun Aug 11 00:04:14 2013
+++ src/usr.bin/tr/str.c Sun Aug 11 00:05:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.21 2013/08/11 00:04:14 dholland Exp $ */
+/* $NetBSD: str.c,v 1.22 2013/08/11 00:05:49 dholland 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.21 2013/08/11 00:04:14 dholland Exp $");
+__RCSID("$NetBSD: str.c,v 1.22 2013/08/11 00:05:49 dholland Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -57,7 +57,7 @@ struct str {
int lastch; /* last character */
int equiv[2]; /* equivalence set */
int *set; /* set of characters */
- unsigned char *str; /* user's string */
+ unsigned const char *str; /* user's string */
};
static int backslash(STR *);
@@ -100,7 +100,7 @@ str_destroy(STR *s)
}
void
-str_setstring(STR *s, char *txt)
+str_setstring(STR *s, const char *txt)
{
s->str = txt;
}
@@ -281,7 +281,7 @@ static int
genrange(STR *s)
{
int stopval;
- char *savestart;
+ const char *savestart;
savestart = s->str;
stopval = *++s->str == '\\' ? backslash(s) : *s->str++;
Index: src/usr.bin/tr/tr.c
diff -u src/usr.bin/tr/tr.c:1.11 src/usr.bin/tr/tr.c:1.12
--- src/usr.bin/tr/tr.c:1.11 Sun Aug 11 00:04:14 2013
+++ src/usr.bin/tr/tr.c Sun Aug 11 00:05:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tr.c,v 1.11 2013/08/11 00:04:14 dholland Exp $ */
+/* $NetBSD: tr.c,v 1.12 2013/08/11 00:05:49 dholland Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: tr.c,v 1.11 2013/08/11 00:04:14 dholland Exp $");
+__RCSID("$NetBSD: tr.c,v 1.12 2013/08/11 00:05:49 dholland Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -87,7 +87,7 @@ static int string1[NCHARS] = {
0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
}, string2[NCHARS];
-static void setup(int *, char *, STR *, int);
+static void setup(int *, const char *, STR *, int);
__dead static void usage(void);
int
@@ -242,7 +242,7 @@ main(int argc, char **argv)
}
static void
-setup(int *string, char *arg, STR *str, int cflag)
+setup(int *string, const char *arg, STR *str, int cflag)
{
int cnt, *p;
int ch;
