Module Name: src
Committed By: dholland
Date: Sun Aug 11 01:54:36 UTC 2013
Modified Files:
src/usr.bin/tr: str.c tr.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/tr/str.c
cvs rdiff -u -r1.19 -r1.20 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/str.c
diff -u src/usr.bin/tr/str.c:1.28 src/usr.bin/tr/str.c:1.29
--- src/usr.bin/tr/str.c:1.28 Sun Aug 11 01:49:40 2013
+++ src/usr.bin/tr/str.c Sun Aug 11 01:54:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.28 2013/08/11 01:49:40 dholland Exp $ */
+/* $NetBSD: str.c,v 1.29 2013/08/11 01:54:35 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.28 2013/08/11 01:49:40 dholland Exp $");
+__RCSID("$NetBSD: str.c,v 1.29 2013/08/11 01:54:35 dholland Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -53,20 +53,20 @@ __RCSID("$NetBSD: str.c,v 1.28 2013/08/1
struct str {
enum { STRING1, STRING2 } which;
enum { EOS, INFINITE, NORMAL, RANGE, SEQUENCE, SET } state;
- int cnt; /* character count */
- int lastch; /* last character */
- int equiv[2]; /* equivalence set */
- int *set; /* set of characters */
+ int cnt; /* character count */
+ int lastch; /* last character */
+ int equiv[2]; /* equivalence set */
+ int *set; /* set of characters */
const char *str; /* user's string */
};
-static int backslash(STR *);
-static int bracket(STR *);
-static int c_class(const void *, const void *);
+static int backslash(STR *);
+static int bracket(STR *);
+static int c_class(const void *, const void *);
static int *genclass(const char *, size_t);
-static void genequiv(STR *);
-static int genrange(STR *);
-static void genseq(STR *);
+static void genequiv(STR *);
+static int genrange(STR *);
+static void genseq(STR *);
STR *
str_create(int whichstring, const char *txt)
Index: src/usr.bin/tr/tr.c
diff -u src/usr.bin/tr/tr.c:1.19 src/usr.bin/tr/tr.c:1.20
--- src/usr.bin/tr/tr.c:1.19 Sun Aug 11 00:49:15 2013
+++ src/usr.bin/tr/tr.c Sun Aug 11 01:54:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tr.c,v 1.19 2013/08/11 00:49:15 dholland Exp $ */
+/* $NetBSD: tr.c,v 1.20 2013/08/11 01:54:35 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.19 2013/08/11 00:49:15 dholland Exp $");
+__RCSID("$NetBSD: tr.c,v 1.20 2013/08/11 01:54:35 dholland Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -107,8 +107,8 @@ main(int argc, char **argv)
setup(string1, argv[0], 1, cflag);
setup(string2, argv[1], 2, 0);
-
- for (lastch = OOBCH; (ch = getchar()) != EOF;)
+
+ for (lastch = OOBCH; (ch = getchar()) != EOF; )
if (!string1[ch] && (!string2[ch] || lastch != ch)) {
lastch = ch;
(void)putchar(ch);
