Now that we use "nbtool_config.h" we can use __dead again and drop

[bsdgames-darwin.git] / fortune / strfile / strfile.c

diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c
index a857b4f9bc0a00e3bc81b05e5ce0f476adbecfdd..ae8f7b45d9f6c6fc4b6531230db0306f36ee59d8 100644 (file)
--- a/fortune/strfile/strfile.c
+++ b/fortune/strfile/strfile.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: strfile.c,v 1.31 2011/08/16 19:53:03 dholland Exp $    */
+/*     $NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $ */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -32,6 +32,10 @@
  * SUCH DAMAGE.
  */
 
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #ifdef __NetBSD__
 #include <sys/cdefs.h>
 #ifndef lint
@@ -43,13 +47,11 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
 #if 0
 static char sccsid[] = "@(#)strfile.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: strfile.c,v 1.31 2011/08/16 19:53:03 dholland Exp $");
+__RCSID("$NetBSD: strfile.c,v 1.38 2013/09/19 00:34:00 uwe Exp $");
 #endif
 #endif /* not lint */
 #endif /* __NetBSD__ */
 
-/* n.b.: this file is used at build-time - i.e. during build.sh. */
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <ctype.h>
@@ -67,30 +69,6 @@ __RCSID("$NetBSD: strfile.c,v 1.31 2011/08/16 19:53:03 dholland Exp $");
 #define        MAXPATHLEN      1024
 #endif /* MAXPATHLEN */
 
-static uint32_t h2nl(uint32_t h);
-static void getargs(int argc, char **argv);
-static void usage(void) __dead;
-static void add_offset(FILE *fp, off_t off);
-static void do_order(void);
-static int cmp_str(const void *vp1, const void *vp2);
-static void randomize(void);
-static void fwrite_be_offt(off_t off, FILE *f);
-
-static uint32_t
-h2nl(uint32_t h)
-{
-        unsigned char c[4];
-        uint32_t rv;
-
-        c[0] = (h >> 24) & 0xff;
-        c[1] = (h >> 16) & 0xff;
-        c[2] = (h >>  8) & 0xff;
-        c[3] = (h >>  0) & 0xff;
-        memcpy(&rv, c, sizeof rv);
-
-        return (rv);
-}
-
 /*
  *     This program takes a file composed of strings separated by
  * lines starting with two consecutive delimiting character (default
@@ -114,9 +92,6 @@ h2nl(uint32_t h)
  *     Added ordering options.
  */
 
-# define       TRUE    1
-# define       FALSE   0
-
 # define       STORING_PTRS    (Oflag || Rflag)
 # define       CHUNKSIZE       512
 
@@ -138,11 +113,11 @@ static char *Infile = NULL;               /* input file name */
 static char Outfile[MAXPATHLEN] = "";  /* output file name */
 static char Delimch = '%';             /* delimiting character */
 
-static int Sflag       = FALSE;        /* silent run flag */
-static int Oflag       = FALSE;        /* ordering flag */
-static int Iflag       = FALSE;        /* ignore case flag */
-static int Rflag       = FALSE;        /* randomize order flag */
-static int Xflag       = FALSE;        /* set rotated bit */
+static int Sflag       = 0;            /* silent run flag */
+static int Oflag       = 0;            /* ordering flag */
+static int Iflag       = 0;            /* ignore case flag */
+static int Rflag       = 0;            /* randomize order flag */
+static int Xflag       = 0;            /* set rotated bit */
 static long Num_pts    = 0;            /* number of pointers/strings */
 
 static off_t *Seekpts;
@@ -153,24 +128,15 @@ static STRFILE Tbl;                       /* statistics table */
 
 static STR *Firstch;                   /* first chars of each string */
 
-#ifdef __GNUC__
-#define NORETURN       __dead
-#else
-#define NORETURN
-#endif
-
-#ifndef __dead /* not NetBSD, presumably */
-#define __dead ;
-#endif
 
-void   add_offset(FILE *, off_t);
-int    cmp_str(const void *, const void *);
-void   do_order(void);
-void   fwrite_be_offt(off_t, FILE *);
-void   getargs(int, char *[]);
-int    main(int, char *[]);
-void   randomize(void);
-void   usage(void) NORETURN;
+static uint32_t h2nl(uint32_t h);
+static void getargs(int argc, char **argv);
+static void usage(void) __dead;
+static void add_offset(FILE *fp, off_t off);
+static void do_order(void);
+static int cmp_str(const void *vp1, const void *vp2);
+static void randomize(void);
+static void fwrite_be_offt(off_t off, FILE *f);
 
 
 /*
@@ -187,11 +153,12 @@ main(int ac, char **av)
 {
        char            *sp, dc;
        FILE            *inf, *outf;
-       off_t           last_off, length, pos, *p;
-       int             first, cnt;
+       off_t           last_off, length, pos;
+       int             first;
        char            *nsp;
        STR             *fp;
        static char     string[257];
+       long            i;
 
        /* sanity test */
        if (sizeof(uint32_t) != 4)
@@ -243,7 +210,7 @@ main(int ac, char **av)
                        else
                                fp->first = *nsp;
                        fp->pos = Seekpts[Num_pts - 1];
-                       first = FALSE;
+                       first = 0;
                }
        } while (sp != NULL);
 
@@ -281,8 +248,8 @@ main(int ac, char **av)
        Tbl.str_flags = h2nl(Tbl.str_flags);
        (void) fwrite((char *) &Tbl, sizeof Tbl, 1, outf);
        if (STORING_PTRS) {
-               for (p = Seekpts, cnt = Num_pts; cnt--; ++p)
-                       fwrite_be_offt(*p, outf);
+               for (i = 0; i < Num_pts; i++)
+                       fwrite_be_offt(Seekpts[i], outf);
        }
        fflush(outf);
        if (ferror(outf))
@@ -417,8 +384,8 @@ cmp_str(const void *vp1, const void *vp2)
        (void) fseek(Sort_1, p1->pos, SEEK_SET);
        (void) fseek(Sort_2, p2->pos, SEEK_SET);
 
-       n1 = FALSE;
-       n2 = FALSE;
+       n1 = 0;
+       n2 = 0;
        while (!isalnum(c1 = getc(Sort_1)) && c1 != '\0')
                SET_N(n1, c1);
        while (!isalnum(c2 = getc(Sort_2)) && c2 != '\0')
@@ -458,7 +425,7 @@ randomize(void)
        off_t   tmp;
        off_t   *sp;
 
-       srandom((int)(time((time_t *) NULL) + getpid()));
+       srandom((int)(time(NULL) + getpid()));
 
        Tbl.str_flags |= STR_RANDOM;
        cnt = Tbl.str_numstr;
@@ -492,3 +459,18 @@ fwrite_be_offt(off_t off, FILE *f)
        }
        fwrite(c, sizeof(c), 1, f);
 }
+
+static uint32_t
+h2nl(uint32_t h)
+{
+        unsigned char c[4];
+        uint32_t rv;
+
+        c[0] = (h >> 24) & 0xff;
+        c[1] = (h >> 16) & 0xff;
+        c[2] = (h >>  8) & 0xff;
+        c[3] = (h >>  0) & 0xff;
+        memcpy(&rv, c, sizeof rv);
+
+        return (rv);
+}