remove duplicate

[bsdgames-darwin.git] / number / number.c

diff --git a/number/number.c b/number/number.c
index 971125449b5e75e4a99820d1967dd0606ed9b149..5cf417054431b9d4fdfa81e5450b1b08cfa8e85f 100644 (file)
--- a/number/number.c
+++ b/number/number.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: number.c,v 1.7 1999/09/08 21:17:53 jsm Exp $   */
+/*     $NetBSD: number.c,v 1.15 2012/06/19 05:46:09 dholland Exp $     */

 
 /*
  * Copyright (c) 1988, 1993, 1994
 
 /*
  * Copyright (c) 1988, 1993, 1994


@@ -12,11 +12,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.
  *


@@ -35,15 +31,15 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
 
 #include <sys/cdefs.h>
 #ifndef lint

-__COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\
+ The Regents of the University of California.  All rights reserved.");

 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)number.c   8.3 (Berkeley) 5/4/95";
 #else
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)number.c   8.3 (Berkeley) 5/4/95";
 #else

-__RCSID("$NetBSD: number.c,v 1.7 1999/09/08 21:17:53 jsm Exp $");
+__RCSID("$NetBSD: number.c,v 1.15 2012/06/19 05:46:09 dholland Exp $");

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


@@ -80,19 +76,17 @@ static const char   *const name1[] = {
        "novemdecillion",               "vigintillion",
 };
 
        "novemdecillion",               "vigintillion",
 };
 

-void   convert __P((char *));
-int    main __P((int, char *[]));
-int    number __P((const char *, int));
-void   pfract __P((int));
-int    unit __P((int, const char *));
-void   usage __P((void)) __attribute__((__noreturn__));
+int    main(int, char *[]);
+static void convert(char *);
+static int number(const char *, int);
+static void pfract(int);
+static int unit(int, const char *);
+static void usage(void) __dead;

 
 

-int lflag;
+static int lflag;

 
 int
 
 int

-main(argc, argv)
-       int argc;
-       char *argv[];
+main(int argc, char *argv[])

 {
        int ch, first;
        char line[256];
 {
        int ch, first;
        char line[256];


@@ -129,8 +123,7 @@ main(argc, argv)
 }
 
 void
 }
 
 void

-convert(line)
-       char *line;
+convert(char *line)

 {
        int flen, len, rval;
        char *p, *fraction;
 {
        int flen, len, rval;
        char *p, *fraction;


@@ -138,14 +131,14 @@ convert(line)
        flen = 0;
        fraction = NULL;
        for (p = line; *p != '\0' && *p != '\n'; ++p) {
        flen = 0;
        fraction = NULL;
        for (p = line; *p != '\0' && *p != '\n'; ++p) {

-               if (isblank(*p)) {
+               if (isblank((unsigned char)*p)) {

                        if (p == line) {
                                ++line;
                                continue;
                        }
                        goto badnum;
                }
                        if (p == line) {
                                ++line;
                                continue;
                        }
                        goto badnum;
                }

-               if (isdigit(*p))
+               if (isdigit((unsigned char)*p))

                        continue;
                switch (*p) {
                case '.':
                        continue;
                switch (*p) {
                case '.':


@@ -198,9 +191,7 @@ badnum:                     errx(1, "illegal number: %s", line);
 }
 
 int
 }
 
 int

-unit(len, p)
-       int len;
-       const char *p;
+unit(int len, const char *p)

 {
        int off, rval;
 
 {
        int off, rval;
 


@@ -234,9 +225,7 @@ unit(len, p)
 }
 
 int
 }
 
 int

-number(p, len)
-       const char *p;
-       int len;
+number(const char *p, int len)

 {
        int val, rval;
 
 {
        int val, rval;
 


@@ -274,8 +263,7 @@ number(p, len)
 }
 
 void
 }
 
 void

-pfract(len)
-       int len;
+pfract(int len)

 {
        static const char *const pref[] = { "", "ten-", "hundred-" };
 
 {
        static const char *const pref[] = { "", "ten-", "hundred-" };
 


@@ -293,7 +281,7 @@ pfract(len)
 }
 
 void
 }
 
 void

-usage()
+usage(void)

 {
        (void)fprintf(stderr, "usage: number [# ...]\n");
        exit(1);
 {
        (void)fprintf(stderr, "usage: number [# ...]\n");
        exit(1);