From: millert <millert@openbsd.org>
Date: Mon, 3 Jun 2024 00:58:04 +0000 (+0000)
Subject: Spelling fixes and removal of unneeded prototypes and extern.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fa9a54978073e7b3f09e0c805c7214dcdf61857c;p=openbsd

Spelling fixes and removal of unneeded prototypes and extern.
From jsg@ via upstream.
---

diff --git a/usr.bin/awk/FIXES b/usr.bin/awk/FIXES
index 15c4630675e..5bfc3cada83 100644
--- a/usr.bin/awk/FIXES
+++ b/usr.bin/awk/FIXES
@@ -25,6 +25,10 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the 
 second edition of the AWK book was published in September 2023.
 
+May 27, 2024
+	Spelling fixes and removal of unneeded prototypes and extern.
+	Thanks to Jonathan Gray.
+
 May 4, 2024
 	Fixed a use-after-free bug with ARGV for "delete ARGV".
 	Also ENVtab is no longer global. Thanks to Benjamin Sturz
diff --git a/usr.bin/awk/FIXES.1e b/usr.bin/awk/FIXES.1e
index 8cbd6ac1a09..880226dd9d0 100644
--- a/usr.bin/awk/FIXES.1e
+++ b/usr.bin/awk/FIXES.1e
@@ -224,7 +224,7 @@ January 9, 2020:
 	mere warnings. Thanks to Martijn Dekker <martijn@inlv.org>.
 
 January 5, 2020:
-	Fix a bug in the concatentation of two string constants into
+	Fix a bug in the concatenation of two string constants into
 	one done in the grammar.  Fixes GitHub issue #61.  Thanks
 	to GitHub user awkfan77 for pointing out the direction for
 	the fix.  New test T.concat added to the test suite.
@@ -866,7 +866,7 @@ Jan 13, 1999:
 	added a few (int) casts to silence useless compiler warnings.
 	e.g., errorflag= in run.c jump().
 
-	added proctab.c to the bundle outout; one less thing
+	added proctab.c to the bundle output; one less thing
 	to have to compile out of the box.
 
 	added calls to _popen and _pclose to the win95 stub for
diff --git a/usr.bin/awk/README.md b/usr.bin/awk/README.md
index ea232e87689..bb1a185e829 100644
--- a/usr.bin/awk/README.md
+++ b/usr.bin/awk/README.md
@@ -27,7 +27,7 @@ this affects `length`, `substr`, `index`, `match`, `split`,
 points are not necessarily characters.
 
 UTF-8 sequences may appear in literal strings and regular expressions.
-Aribtrary characters may be included with `\u` followed by 1 to 8 hexadecimal digits.
+Arbitrary characters may be included with `\u` followed by 1 to 8 hexadecimal digits.
 
 ### Regular expressions ###
 
diff --git a/usr.bin/awk/awk.h b/usr.bin/awk/awk.h
index 3b5c67b60c3..2848d343cf7 100644
--- a/usr.bin/awk/awk.h
+++ b/usr.bin/awk/awk.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awk.h,v 1.31 2023/11/25 16:31:33 millert Exp $	*/
+/*	$OpenBSD: awk.h,v 1.32 2024/06/03 00:58:04 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -179,7 +179,6 @@ typedef struct Node {
 #define	NIL	((Node *) 0)
 
 extern Node	*winner;
-extern Node	*nullstat;
 extern Node	*nullnode;
 
 /* ctypes */
diff --git a/usr.bin/awk/lex.c b/usr.bin/awk/lex.c
index f2b7d09e60a..ca546400f28 100644
--- a/usr.bin/awk/lex.c
+++ b/usr.bin/awk/lex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lex.c,v 1.33 2024/06/03 00:55:05 millert Exp $	*/
+/*	$OpenBSD: lex.c,v 1.34 2024/06/03 00:58:04 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -227,7 +227,7 @@ int yylex(void)
 				;
 			unput(c);
 			/*
-			 * Next line is a hack, itcompensates for
+			 * Next line is a hack, it compensates for
 			 * unput's treatment of \n.
 			 */
 			lineno++;
diff --git a/usr.bin/awk/main.c b/usr.bin/awk/main.c
index ef5a724a8df..5c4241d5a1b 100644
--- a/usr.bin/awk/main.c
+++ b/usr.bin/awk/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.70 2024/05/04 22:59:21 millert Exp $	*/
+/*	$OpenBSD: main.c,v 1.71 2024/06/03 00:58:04 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -23,7 +23,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
 ****************************************************************/
 
-const char	*version = "version 20240504";
+const char	*version = "version 20240527";
 
 #define DEBUG
 #include <stdio.h>
diff --git a/usr.bin/awk/proto.h b/usr.bin/awk/proto.h
index 0b578cdcc63..37882294f9f 100644
--- a/usr.bin/awk/proto.h
+++ b/usr.bin/awk/proto.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proto.h,v 1.24 2024/06/03 00:55:05 millert Exp $	*/
+/*	$OpenBSD: proto.h,v 1.25 2024/06/03 00:58:04 millert Exp $	*/
 /****************************************************************
 Copyright (C) Lucent Technologies 1997
 All Rights Reserved
@@ -35,9 +35,6 @@ extern	void	startreg(void);
 extern	int	input(void);
 extern	void	unput(int);
 extern	void	unputstr(const char *);
-extern	int	yylook(void);
-extern	int	yyback(int *, int);
-extern	int	yyinput(void);
 
 extern	fa	*makedfa(const char *, bool);
 extern	fa	*mkdfa(const char *, bool);
@@ -170,7 +167,6 @@ extern	Cell	*boolop(Node **, int);
 extern	Cell	*relop(Node **, int);
 extern	void	tfree(Cell *);
 extern	Cell	*gettemp(void);
-extern	Cell	*field(Node **, int);
 extern	Cell	*indirect(Node **, int);
 extern	Cell	*substr(Node **, int);
 extern	Cell	*sindex(Node **, int);