Fix merge conflicts

[bsdgames-darwin.git] / boggle / mkindex / mkindex.c

diff --git a/boggle/mkindex/mkindex.c b/boggle/mkindex/mkindex.c
index ef0126ed7cd695058182b2031493e45f9f7fa964..fad2264478f0078043a853f22a6e0beb090236f7 100644 (file)
--- a/boggle/mkindex/mkindex.c
+++ b/boggle/mkindex/mkindex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $ */
+/* $NetBSD: mkindex.c,v 1.12 2021/05/02 12:50:44 rillig Exp $ */

 
 /*-
  * Copyright (c) 1993
 
 /*-
  * Copyright (c) 1993


@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -44,7 +40,7 @@ static char copyright[] = "@(#) Copyright (c) 1993\n\
 static char sccsid[] = "@(#)mkindex.c  8.1 (Berkeley) 6/11/93";
 #else
 static char rcsid[] =
 static char sccsid[] = "@(#)mkindex.c  8.1 (Berkeley) 6/11/93";
 #else
 static char rcsid[] =

-    "$NetBSD: mkindex.c,v 1.8 2000/07/31 11:29:48 simonb Exp $";
+    "$NetBSD: mkindex.c,v 1.12 2021/05/02 12:50:44 rillig Exp $";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 


@@ -53,8 +49,7 @@ static char rcsid[] =
 
 #include "bog.h"
 
 
 #include "bog.h"
 

-int main(void);
-char *nextword(FILE *, char *, int *, int *);
+static char *nextword(FILE *, char *, int *, int *);

 
 int
 main(void)
 
 int
 main(void)


@@ -99,11 +94,8 @@ main(void)
  * Also set clen to the length of the compressed word (for mkindex) and
  * rlen to the strlen() of the real word
  */
  * Also set clen to the length of the compressed word (for mkindex) and
  * rlen to the strlen() of the real word
  */

-char *
-nextword(fp, buffer, clen, rlen)
-       FILE *fp;
-       char *buffer;
-       int *clen, *rlen;
+static char *
+nextword(FILE *fp, char *buffer, int *clen, int *rlen)

 {
        int ch, pcount;
        char *p, *q;
 {
        int ch, pcount;
        char *p, *q;


@@ -120,7 +112,7 @@ nextword(fp, buffer, clen, rlen)
                return (NULL);
 
        p = buf + (*clen = pcount);
                return (NULL);
 
        p = buf + (*clen = pcount);

- 
+

        while ((ch = getc(fp)) != EOF && ch >= 'a')
                        *p++ = ch;
                lastch = ch;
        while ((ch = getc(fp)) != EOF && ch >= 'a')
                        *p++ = ch;
                lastch = ch;