games: remove trailing whitespace in *.c and *.h

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

diff --git a/factor/factor.c b/factor/factor.c
index 0cd323ca4fc5d94515d4b1f6a3fcc885b86fe4e8..6329ec79d3c417a38bfa8c9289a4b96a2fa412dd 100644 (file)
--- a/factor/factor.c
+++ b/factor/factor.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $     */
+/*     $NetBSD: factor.c,v 1.38 2020/10/12 13:54:51 christos Exp $     */
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
 __SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $");
+__RCSID("$NetBSD: factor.c,v 1.38 2020/10/12 13:54:51 christos Exp $");
 #endif
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 356666 2020-01-12 20:25:11Z gad $");
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 356666 2020-01-12 20:25:11Z gad
  * If the -x flag is specified numbers are printed in hex.
  *
  * If no number args are given, the list of numbers are read from stdin.
- * If no args are given, the list of numbers are read from stdin.
  */
 
 #include <ctype.h>
@@ -120,7 +119,6 @@ static void BN_print_fp(FILE *, const BIGNUM *);
 
 static void    BN_print_dec_fp(FILE *, const BIGNUM *);
 static void    convert_str2bn(BIGNUM **, char *);
-static bool    is_hex_str(char *);
 static void    pr_fact(BIGNUM *, int, int);    /* print factors of a value */
 static void    pr_print(BIGNUM *, int, int);   /* print a prime */
 static void    usage(void) __dead;
@@ -226,6 +224,7 @@ pr_fact(BIGNUM *val, int hflag, int xflag)
        } else
                BN_print_dec_fp(stdout, val);
        putchar(':');
+       fflush(stdout);
        for (fact = &prime[0]; !BN_is_one(val); ++fact) {
                /* Look for the smallest factor. */
                do {
@@ -451,29 +450,6 @@ BN_dup(const BIGNUM *a)
 
 #endif
 
-/*
- * Scan the string from left-to-right to see if the longest substring
- * is a valid hexadecimal number.
- */
-static bool
-is_hex_str(char *str)
-{
-       char c, *p;
-       bool saw_hex = false;
-
-       for (p = str; *p; p++) {
-               if (isdigit((unsigned char)*p))
-                       continue;
-               c = tolower((unsigned char)*p);
-               if (c >= 'a' && c <= 'f') {
-                       saw_hex = true;
-                       continue;
-               }
-               break;  /* Not a hexadecimal digit. */
-       }
-       return saw_hex;
-}
-
 /* Convert string pointed to by *str to a bignum.  */
 static void
 convert_str2bn(BIGNUM **val, char *p)
@@ -486,7 +462,7 @@ convert_str2bn(BIGNUM **val, char *p)
        if (*p == '0' && (p[1] == 'x' || p[1] == 'X')) {
                n = BN_hex2bn(val, p + 2);
        } else {
-               n = is_hex_str(p) ? BN_hex2bn(val, p) : BN_dec2bn(val, p);
+               n = BN_dec2bn(val, p);
        }
        if (n == 0)
                errx(1, "%s: illegal numeric format.", p);