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 15c4630..5bfc3ca 100644 (file)
--- 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 8cbd6ac..880226d 100644 (file)
--- 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 ea232e8..bb1a185 100644 (file)
--- 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 3b5c67b..2848d34 100644 (file)
--- 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 f2b7d09..ca54640 100644 (file)
--- 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 ef5a724..5c4241d 100644 (file)
--- 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 0b578cd..3788229 100644 (file)
--- 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);