xnu-7195.101.1.tar.gz

[apple/xnu.git] / libkern / stdio / scanf.c

diff --git a/libkern/stdio/scanf.c b/libkern/stdio/scanf.c
index 0bc3a4363a912633886f3a3cfea5790f38ff7a61..0c634abf4ee2d73176793f69f8790ae6a002b2f7 100644 (file)
--- a/libkern/stdio/scanf.c
+++ b/libkern/stdio/scanf.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2016 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*-


@@ -61,126 +61,131 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <stdarg.h>
+#include <stddef.h>
+#include <string.h>

 #include <sys/cdefs.h>
 #include <sys/cdefs.h>

+#include <sys/param.h>
+
+quad_t strtoq(const char *, char **, int);
+u_quad_t strtouq(const char *, char **, int);

 
 

-#if 0 /* XXX coming soon */
-#include <ctype.h>
-#else

 static inline int
 isspace(char c)
 {
 static inline int
 isspace(char c)
 {

-       return (c == ' ' || c == '\t' || c == '\n' || c == '\12');
+       return c == ' ' || c == '\t' || c == '\n' || c == '\12';

 }
 }

-#endif
-#include <stdarg.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/systm.h>

 
 

-#define        BUF             32      /* Maximum length of numeric string. */
+#define BUF             32      /* Maximum length of numeric string. */

 
 /*
  * Flags used during conversion.
  */
 
 /*
  * Flags used during conversion.
  */

-#define        LONG            0x01    /* l: long or double */
-#define        SHORT           0x04    /* h: short */
-#define        SUPPRESS        0x08    /* *: suppress assignment */
-#define        POINTER         0x10    /* p: void * (as hex) */
-#define        NOSKIP          0x20    /* [ or c: do not skip blanks */
-#define        LONGLONG        0x400   /* ll: long long (+ deprecated q: quad) */
-#define        SHORTSHORT      0x4000  /* hh: char */
-#define        UNSIGNED        0x8000  /* %[oupxX] conversions */
+#define LONG            0x01    /* l: long or double */
+#define SHORT           0x04    /* h: short */
+#define SUPPRESS        0x08    /* *: suppress assignment */
+#define POINTER         0x10    /* p: void * (as hex) */
+#define NOSKIP          0x20    /* [ or c: do not skip blanks */
+#define LONGLONG        0x400   /* ll: long long (+ deprecated q: quad) */
+#define SHORTSHORT      0x4000  /* hh: char */
+#define UNSIGNED        0x8000  /* %[oupxX] conversions */

 
 /*
  * The following are used in numeric conversions only:
  * SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point;
  * SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
  */
 
 /*
  * The following are used in numeric conversions only:
  * SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point;
  * SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
  */

-#define        SIGNOK          0x40    /* +/- is (still) legal */
-#define        NDIGITS         0x80    /* no digits detected */
+#define SIGNOK          0x40    /* +/- is (still) legal */
+#define NDIGITS         0x80    /* no digits detected */

 
 

-#define        DPTOK           0x100   /* (float) decimal point is still legal */
-#define        EXPOK           0x200   /* (float) exponent (e+3, etc) still legal */
+#define DPTOK           0x100   /* (float) decimal point is still legal */
+#define EXPOK           0x200   /* (float) exponent (e+3, etc) still legal */

 
 

-#define        PFXOK           0x100   /* 0x prefix is (still) legal */
-#define        NZDIGITS        0x200   /* no zero digits detected */
+#define PFXOK           0x100   /* 0x prefix is (still) legal */
+#define NZDIGITS        0x200   /* no zero digits detected */

 
 /*
  * Conversion types.
  */
 
 /*
  * Conversion types.
  */

-#define        CT_CHAR         0       /* %c conversion */
-#define        CT_CCL          1       /* %[...] conversion */
-#define        CT_STRING       2       /* %s conversion */
-#define        CT_INT          3       /* %[dioupxX] conversion */
+#define CT_CHAR         0       /* %c conversion */
+#define CT_CCL          1       /* %[...] conversion */
+#define CT_STRING       2       /* %s conversion */
+#define CT_INT          3       /* %[dioupxX] conversion */

 
 static const u_char *__sccl(char *, const u_char *);
 
 
 static const u_char *__sccl(char *, const u_char *);
 

+int sscanf(const char *, const char *, ...);
+int vsscanf(const char *, char const *, va_list);
+

 int
 sscanf(const char *ibuf, const char *fmt, ...)
 {
        va_list ap;
        int ret;
 int
 sscanf(const char *ibuf, const char *fmt, ...)
 {
        va_list ap;
        int ret;

-       
+

        va_start(ap, fmt);
        ret = vsscanf(ibuf, fmt, ap);
        va_end(ap);
        va_start(ap, fmt);
        ret = vsscanf(ibuf, fmt, ap);
        va_end(ap);

-       return(ret);
+       return ret;

 }
 
 int
 vsscanf(const char *inp, char const *fmt0, va_list ap)
 {
 }
 
 int
 vsscanf(const char *inp, char const *fmt0, va_list ap)
 {

-       int inr;
+       ssize_t inr;

        const u_char *fmt = (const u_char *)fmt0;
        const u_char *fmt = (const u_char *)fmt0;

-       int c;                  /* character from format, or conversion */
-       size_t width;           /* field width, or 0 */
-       char *p;                /* points into all kinds of strings */
-       int n;                  /* handy integer */
-       int flags;              /* flags as defined above */
-       char *p0;               /* saves original value of p when necessary */
-       int nassigned;          /* number of fields assigned */
-       int nconversions;       /* number of conversions */
-       int nread;              /* number of characters consumed from fp */
-       int base;               /* base argument to conversion function */
-       char ccltab[256];       /* character class table for %[...] */
-       char buf[BUF];          /* buffer for numeric conversions */
+       ssize_t width;           /* field width, or 0 */
+       char *p;                /* points into all kinds of strings */
+       int flags;              /* flags as defined above */
+       char *p0;               /* saves original value of p when necessary */
+       int nassigned = 0;          /* number of fields assigned */
+       int nconversions = 0;       /* number of conversions */
+       int nread = 0;              /* number of characters consumed from fp */
+       int base = 0;               /* base argument to conversion function */
+       char ccltab[256];       /* character class table for %[...] */
+       char buf[BUF];          /* buffer for numeric conversions */

 
        /* `basefix' is used to avoid `if' tests in the integer scanner */
        static short basefix[17] =
 
        /* `basefix' is used to avoid `if' tests in the integer scanner */
        static short basefix[17] =

-               { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-       inr = strlen(inp);
-       
-       nassigned = 0;
-       nconversions = 0;
-       nread = 0;
-       base = 0;               /* XXX just to keep gcc happy */
+       { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
+
+       inr = (ssize_t)strlen(inp);
+

        for (;;) {
        for (;;) {

-               c = *fmt++;
-               if (c == 0)
-                       return (nassigned);
+               char c = (char)*fmt++; /* character from format, or conversion */
+               if (c == 0) {
+                       return nassigned;
+               }

                if (isspace(c)) {
                if (isspace(c)) {

-                       while (inr > 0 && isspace(*inp))
-                               nread++, inr--, inp++;
+                       while (inr > 0 && isspace(*inp)) {
+                               nread++;
+                               inr--;
+                               inp++;
+                       }

                        continue;
                }
                        continue;
                }

-               if (c != '%')
+               if (c != '%') {

                        goto literal;
                        goto literal;

+               }

                width = 0;
                flags = 0;
                /*
                 * switch on the format.  continue if done;
                 * break once format type is derived.
                 */
                width = 0;
                flags = 0;
                /*
                 * switch on the format.  continue if done;
                 * break once format type is derived.
                 */

-again:         c = *fmt++;
+again:
+               c = (char)*fmt++;

                switch (c) {
                case '%':
 literal:
                switch (c) {
                case '%':
 literal:

-                       if (inr <= 0)
+                       if (inr <= 0) {

                                goto input_failure;
                                goto input_failure;

-                       if (*inp != c)
+                       }
+                       if (*inp != c) {

                                goto match_failure;
                                goto match_failure;

-                       inr--, inp++;
+                       }
+                       inr--;
+                       inp++;

                        nread++;
                        continue;
 
                        nread++;
                        continue;
 


@@ -191,18 +196,20 @@ literal:
                        if (flags & LONG) {
                                flags &= ~LONG;
                                flags |= LONGLONG;
                        if (flags & LONG) {
                                flags &= ~LONG;
                                flags |= LONGLONG;

-                       } else
+                       } else {

                                flags |= LONG;
                                flags |= LONG;

+                       }

                        goto again;
                case 'q':
                        goto again;
                case 'q':

-                       flags |= LONGLONG;      /* not quite */
+                       flags |= LONGLONG;      /* not quite */

                        goto again;
                case 'h':
                        if (flags & SHORT) {
                                flags &= ~SHORT;
                                flags |= SHORTSHORT;
                        goto again;
                case 'h':
                        if (flags & SHORT) {
                                flags &= ~SHORT;
                                flags |= SHORTSHORT;

-                       } else
+                       } else {

                                flags |= SHORT;
                                flags |= SHORT;

+                       }

                        goto again;
 
                case '0': case '1': case '2': case '3': case '4':
                        goto again;
 
                case '0': case '1': case '2': case '3': case '4':


@@ -237,7 +244,7 @@ literal:
 
                case 'X':
                case 'x':
 
                case 'X':
                case 'x':

-                       flags |= PFXOK; /* enable 0x prefixing */
+                       flags |= PFXOK; /* enable 0x prefixing */

                        c = CT_INT;
                        flags |= UNSIGNED;
                        base = 16;
                        c = CT_INT;
                        flags |= UNSIGNED;
                        base = 16;


@@ -258,7 +265,7 @@ literal:
                        c = CT_CHAR;
                        break;
 
                        c = CT_CHAR;
                        break;
 

-               case 'p':       /* pointer format is like hex */
+               case 'p':       /* pointer format is like hex */

                        flags |= POINTER | PFXOK;
                        c = CT_INT;
                        flags |= UNSIGNED;
                        flags |= POINTER | PFXOK;
                        c = CT_INT;
                        flags |= UNSIGNED;


@@ -267,26 +274,29 @@ literal:
 
                case 'n':
                        nconversions++;
 
                case 'n':
                        nconversions++;

-                       if (flags & SUPPRESS)   /* ??? */
+                       if (flags & SUPPRESS) { /* ??? */

                                continue;
                                continue;

-                       if (flags & SHORTSHORT)
-                               *va_arg(ap, char *) = nread;
-                       else if (flags & SHORT)
-                               *va_arg(ap, short *) = nread;
-                       else if (flags & LONG)
-                               *va_arg(ap, long *) = nread;
-                       else if (flags & LONGLONG)
-                               *va_arg(ap, long long *) = nread;
-                       else
-                               *va_arg(ap, int *) = nread;
+                       }
+                       if (flags & SHORTSHORT) {
+                               *va_arg(ap, char *) = (char)nread;
+                       } else if (flags & SHORT) {
+                               *va_arg(ap, short *) = (short)nread;
+                       } else if (flags & LONG) {
+                               *va_arg(ap, long *) = (long)nread;
+                       } else if (flags & LONGLONG) {
+                               *va_arg(ap, long long *) = (long long)nread;
+                       } else {
+                               *va_arg(ap, int *) = (int)nread;
+                       }

                        continue;
                }
 
                /*
                 * We have a conversion that requires input.
                 */
                        continue;
                }
 
                /*
                 * We have a conversion that requires input.
                 */

-               if (inr <= 0)
+               if (inr <= 0) {

                        goto input_failure;
                        goto input_failure;

+               }

 
                /*
                 * Consume leading white space, except for formats
 
                /*
                 * Consume leading white space, except for formats


@@ -295,10 +305,11 @@ literal:
                if ((flags & NOSKIP) == 0) {
                        while (isspace(*inp)) {
                                nread++;
                if ((flags & NOSKIP) == 0) {
                        while (isspace(*inp)) {
                                nread++;

-                               if (--inr > 0)
+                               if (--inr > 0) {

                                        inp++;
                                        inp++;

-                               else 
+                               } else {

                                        goto input_failure;
                                        goto input_failure;

+                               }

                        }
                        /*
                         * Note that there is at least one character in
                        }
                        /*
                         * Note that there is at least one character in


@@ -311,23 +322,25 @@ literal:
                 * Do the conversion.
                 */
                switch (c) {
                 * Do the conversion.
                 */
                switch (c) {

-

                case CT_CHAR:
                        /* scan arbitrary characters (sets NOSKIP) */
                case CT_CHAR:
                        /* scan arbitrary characters (sets NOSKIP) */

-                       if (width == 0)
+                       if (width == 0) {

                                width = 1;
                                width = 1;

+                       }

                        if (flags & SUPPRESS) {
                                size_t sum = 0;
                                for (;;) {
                        if (flags & SUPPRESS) {
                                size_t sum = 0;
                                for (;;) {

-                                       if ((n = inr) < (int)width) {
-                                               sum += n;
+                                       ssize_t n = inr;
+                                       if (n < width) {
+                                               sum += (size_t)n;

                                                width -= n;
                                                inp += n;
                                                width -= n;
                                                inp += n;

-                                               if (sum == 0)
+                                               if (sum == 0) {

                                                        goto input_failure;
                                                        goto input_failure;

+                                               }

                                                break;
                                        } else {
                                                break;
                                        } else {

-                                               sum += width;
+                                               sum += (size_t)width;

                                                inr -= width;
                                                inp += width;
                                                break;
                                                inr -= width;
                                                inp += width;
                                                break;


@@ -344,60 +357,76 @@ literal:
                        nconversions++;
                        break;
 
                        nconversions++;
                        break;
 

-               case CT_CCL:
+               case CT_CCL: {

                        /* scan a (nonempty) character class (sets NOSKIP) */
                        /* scan a (nonempty) character class (sets NOSKIP) */

-                       if (width == 0)
-                               width = (size_t)~0;     /* `infinity' */
+                       if (width == 0) {
+                               width = SSIZE_MAX;     /* `infinity' */
+                       }

                        /* take only those things in the class */
                        /* take only those things in the class */

+                       ptrdiff_t n;

                        if (flags & SUPPRESS) {
                                n = 0;
                                while (ccltab[(unsigned char)*inp]) {
                        if (flags & SUPPRESS) {
                                n = 0;
                                while (ccltab[(unsigned char)*inp]) {

-                                       n++, inr--, inp++;
-                                       if (--width == 0)
+                                       n++;
+                                       inr--;
+                                       inp++;
+                                       if (--width == 0) {

                                                break;
                                                break;

+                                       }

                                        if (inr <= 0) {
                                        if (inr <= 0) {

-                                               if (n == 0)
+                                               if (n == 0) {

                                                        goto input_failure;
                                                        goto input_failure;

+                                               }

                                                break;
                                        }
                                }
                                                break;
                                        }
                                }

-                               if (n == 0)
+                               if (n == 0) {

                                        goto match_failure;
                                        goto match_failure;

+                               }

                        } else {
                                p0 = p = va_arg(ap, char *);
                                while (ccltab[(unsigned char)*inp]) {
                                        inr--;
                                        *p++ = *inp++;
                        } else {
                                p0 = p = va_arg(ap, char *);
                                while (ccltab[(unsigned char)*inp]) {
                                        inr--;
                                        *p++ = *inp++;

-                                       if (--width == 0)
+                                       if (--width == 0) {

                                                break;
                                                break;

+                                       }

                                        if (inr <= 0) {
                                        if (inr <= 0) {

-                                               if (p == p0)
+                                               if (p == p0) {

                                                        goto input_failure;
                                                        goto input_failure;

+                                               }

                                                break;
                                        }
                                }
                                n = p - p0;
                                                break;
                                        }
                                }
                                n = p - p0;

-                               if (n == 0)
+                               if (n == 0) {

                                        goto match_failure;
                                        goto match_failure;

+                               }

                                *p = 0;
                                nassigned++;
                        }
                        nread += n;
                        nconversions++;
                        break;
                                *p = 0;
                                nassigned++;
                        }
                        nread += n;
                        nconversions++;
                        break;

+               }

 
                case CT_STRING:
                        /* like CCL, but zero-length string OK, & no NOSKIP */
 
                case CT_STRING:
                        /* like CCL, but zero-length string OK, & no NOSKIP */

-                       if (width == 0)
-                               width = (size_t)~0;
+                       if (width == 0) {
+                               width = SSIZE_MAX;
+                       }

                        if (flags & SUPPRESS) {
                        if (flags & SUPPRESS) {

-                               n = 0;
+                               size_t n = 0;

                                while (!isspace(*inp)) {
                                while (!isspace(*inp)) {

-                                       n++, inr--, inp++;
-                                       if (--width == 0)
+                                       n++;
+                                       inr--;
+                                       inp++;
+                                       if (--width == 0) {

                                                break;
                                                break;

-                                       if (inr <= 0)
+                                       }
+                                       if (inr <= 0) {

                                                break;
                                                break;

+                                       }

                                }
                                nread += n;
                        } else {
                                }
                                nread += n;
                        } else {


@@ -405,10 +434,12 @@ literal:
                                while (!isspace(*inp)) {
                                        inr--;
                                        *p++ = *inp++;
                                while (!isspace(*inp)) {
                                        inr--;
                                        *p++ = *inp++;

-                                       if (--width == 0)
+                                       if (--width == 0) {

                                                break;
                                                break;

-                                       if (inr <= 0)
+                                       }
+                                       if (inr <= 0) {

                                                break;
                                                break;

+                                       }

                                }
                                *p = 0;
                                nread += p - p0;
                                }
                                *p = 0;
                                nread += p - p0;


@@ -419,15 +450,9 @@ literal:
 
                case CT_INT:
                        /* scan an integer as if by the conversion function */
 
                case CT_INT:
                        /* scan an integer as if by the conversion function */

-#ifdef hardway
-                       if (width == 0 || width > sizeof(buf) - 1)
+                       if (width <= 0 || width > (ssize_t)(sizeof(buf) - 1)) {

                                width = sizeof(buf) - 1;
                                width = sizeof(buf) - 1;

-#else
-                       /* size_t is unsigned, hence this optimisation */
-                       if (--width > sizeof(buf) - 2)
-                               width = sizeof(buf) - 2;
-                       width++;
-#endif
+                       }

                        flags |= SIGNOK | NDIGITS | NZDIGITS;
                        for (p = buf; width; width--) {
                                c = *inp;
                        flags |= SIGNOK | NDIGITS | NZDIGITS;
                        for (p = buf; width; width--) {
                                c = *inp;


@@ -436,7 +461,6 @@ literal:
                                 * if we accept it as a part of number.
                                 */
                                switch (c) {
                                 * if we accept it as a part of number.
                                 */
                                switch (c) {

-

                                /*
                                 * The digit 0 is always legal, but is
                                 * special.  For %i conversions, if no
                                /*
                                 * The digit 0 is always legal, but is
                                 * special.  For %i conversions, if no


@@ -454,10 +478,11 @@ literal:
                                                base = 8;
                                                flags |= PFXOK;
                                        }
                                                base = 8;
                                                flags |= PFXOK;
                                        }

-                                       if (flags & NZDIGITS)
-                                           flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-                                       else
-                                           flags &= ~(SIGNOK|PFXOK|NDIGITS);
+                                       if (flags & NZDIGITS) {
+                                               flags &= ~(SIGNOK | NZDIGITS | NDIGITS);
+                                       } else {
+                                               flags &= ~(SIGNOK | PFXOK | NDIGITS);
+                                       }

                                        goto ok;
 
                                /* 1 through 7 always legal */
                                        goto ok;
 
                                /* 1 through 7 always legal */


@@ -470,8 +495,9 @@ literal:
                                /* digits 8 and 9 ok iff decimal or hex */
                                case '8': case '9':
                                        base = basefix[base];
                                /* digits 8 and 9 ok iff decimal or hex */
                                case '8': case '9':
                                        base = basefix[base];

-                                       if (base <= 8)
-                                               break;  /* not legal here */
+                                       if (base <= 8) {
+                                               break;  /* not legal here */
+                                       }

                                        flags &= ~(SIGNOK | PFXOK | NDIGITS);
                                        goto ok;
 
                                        flags &= ~(SIGNOK | PFXOK | NDIGITS);
                                        goto ok;
 


@@ -481,8 +507,9 @@ literal:
                                case 'a': case 'b': case 'c':
                                case 'd': case 'e': case 'f':
                                        /* no need to fix base here */
                                case 'a': case 'b': case 'c':
                                case 'd': case 'e': case 'f':
                                        /* no need to fix base here */

-                                       if (base <= 10)
-                                               break;  /* not legal here */
+                                       if (base <= 10) {
+                                               break;  /* not legal here */
+                                       }

                                        flags &= ~(SIGNOK | PFXOK | NDIGITS);
                                        goto ok;
 
                                        flags &= ~(SIGNOK | PFXOK | NDIGITS);
                                        goto ok;
 


@@ -497,7 +524,7 @@ literal:
                                /* x ok iff flag still set & 2nd char */
                                case 'x': case 'X':
                                        if (flags & PFXOK && p == buf + 1) {
                                /* x ok iff flag still set & 2nd char */
                                case 'x': case 'X':
                                        if (flags & PFXOK && p == buf + 1) {

-                                               base = 16;      /* if %i */
+                                               base = 16;      /* if %i */

                                                flags &= ~PFXOK;
                                                goto ok;
                                        }
                                                flags &= ~PFXOK;
                                                goto ok;
                                        }


@@ -509,15 +536,16 @@ literal:
                                 * for a number.  Stop accumulating digits.
                                 */
                                break;
                                 * for a number.  Stop accumulating digits.
                                 */
                                break;

-               ok:
+ok:

                                /*
                                 * c is legal: store it and look at the next.
                                 */
                                *p++ = c;
                                /*
                                 * c is legal: store it and look at the next.
                                 */
                                *p++ = c;

-                               if (--inr > 0)
+                               if (--inr > 0) {

                                        inp++;
                                        inp++;

-                               else 
-                                       break;          /* end of input */
+                               } else {
+                                       break;          /* end of input */
+                               }

                        }
                        /*
                         * If we had only a sign, it is no good; push
                        }
                        /*
                         * If we had only a sign, it is no good; push


@@ -532,7 +560,7 @@ literal:
                                }
                                goto match_failure;
                        }
                                }
                                goto match_failure;
                        }

-                       c = ((u_char *)p)[-1];
+                       c = p[-1];

                        if (c == 'x' || c == 'X') {
                                --p;
                                inp--;
                        if (c == 'x' || c == 'X') {
                                --p;
                                inp--;


@@ -542,35 +570,36 @@ literal:
                                u_quad_t res;
 
                                *p = 0;
                                u_quad_t res;
 
                                *p = 0;

-                               if ((flags & UNSIGNED) == 0)
-                                   res = strtoq(buf, (char **)NULL, base);
-                               else
-                                   res = strtouq(buf, (char **)NULL, base);
-                               if (flags & POINTER)
+                               if ((flags & UNSIGNED) == 0) {
+                                       res = (u_quad_t)strtoq(buf, (char **)NULL, base);
+                               } else {
+                                       res = strtouq(buf, (char **)NULL, base);
+                               }
+                               if (flags & POINTER) {

                                        *va_arg(ap, void **) =
                                        *va_arg(ap, void **) =

-                                               (void *)(uintptr_t)res;
-                               else if (flags & SHORTSHORT)
-                                       *va_arg(ap, char *) = res;
-                               else if (flags & SHORT)
-                                       *va_arg(ap, short *) = res;
-                               else if (flags & LONG)
-                                       *va_arg(ap, long *) = res;
-                               else if (flags & LONGLONG)
-                                       *va_arg(ap, long long *) = res;
-                               else
-                                       *va_arg(ap, int *) = res;
+                                           (void *)(uintptr_t)res;
+                               } else if (flags & SHORTSHORT) {
+                                       *va_arg(ap, char *) = (char)res;
+                               } else if (flags & SHORT) {
+                                       *va_arg(ap, short *) = (short)res;
+                               } else if (flags & LONG) {
+                                       *va_arg(ap, long *) = (long)res;
+                               } else if (flags & LONGLONG) {
+                                       *va_arg(ap, long long *) = (long long)res;
+                               } else {
+                                       *va_arg(ap, int *) = (int)res;
+                               }

                                nassigned++;
                        }
                        nread += p - buf;
                        nconversions++;
                        break;
                                nassigned++;
                        }
                        nread += p - buf;
                        nconversions++;
                        break;

-

                }
        }
 input_failure:
                }
        }
 input_failure:

-       return (nconversions != 0 ? nassigned : -1);
+       return nconversions != 0 ? nassigned : -1;

 match_failure:
 match_failure:

-       return (nassigned);
+       return nassigned;

 }
 
 /*
 }
 
 /*


@@ -582,22 +611,22 @@ match_failure:
 static const u_char *
 __sccl(char *tab, const u_char *fmt)
 {
 static const u_char *
 __sccl(char *tab, const u_char *fmt)
 {

-       int c, n, v;
+       char v;

 
        /* first `clear' the whole table */
 
        /* first `clear' the whole table */

-       c = *fmt++;             /* first char hat => negated scanset */
+       int c = *fmt++;             /* first char hat => negated scanset */

        if (c == '^') {
        if (c == '^') {

-               v = 1;          /* default => accept */
-               c = *fmt++;     /* get new first char */
-       } else
-               v = 0;          /* default => reject */
-
+               v = 1;          /* default => accept */
+               c = *fmt++;     /* get new first char */
+       } else {
+               v = 0;          /* default => reject */
+       }

        /* XXX: Will not work if sizeof(tab*) > sizeof(char) */
        (void) memset(tab, v, 256);
 
        /* XXX: Will not work if sizeof(tab*) > sizeof(char) */
        (void) memset(tab, v, 256);
 

-       if (c == 0)
-               return (fmt - 1);/* format ended before closing ] */
-
+       if (c == 0) {
+               return fmt - 1;/* format ended before closing ] */
+       }

        /*
         * Now set the entries corresponding to the actual scanset
         * to the opposite of the above.
        /*
         * Now set the entries corresponding to the actual scanset
         * to the opposite of the above.


@@ -607,13 +636,13 @@ __sccl(char *tab, const u_char *fmt)
         */
        v = 1 - v;
        for (;;) {
         */
        v = 1 - v;
        for (;;) {

-               tab[c] = v;             /* take character c */
+               int n;
+               tab[c] = v;             /* take character c */

 doswitch:
 doswitch:

-               n = *fmt++;             /* and examine the next */
+               n = *fmt++;

                switch (n) {
                switch (n) {

-
-               case 0:                 /* format ended too soon */
-                       return (fmt - 1);
+               case 0:                 /* format ended too soon */
+                       return fmt - 1;

 
                case '-':
                        /*
 
                case '-':
                        /*


@@ -637,12 +666,12 @@ doswitch:
                        n = *fmt;
                        if (n == ']' || n < c) {
                                c = '-';
                        n = *fmt;
                        if (n == ']' || n < c) {
                                c = '-';

-                               break;  /* resume the for(;;) */
+                               break;  /* resume the for(;;) */

                        }
                        fmt++;
                        /* fill in the range */
                        do {
                        }
                        fmt++;
                        /* fill in the range */
                        do {

-                           tab[++c] = v;
+                               tab[++c] = v;

                        } while (c < n);
                        c = n;
                        /*
                        } while (c < n);
                        c = n;
                        /*


@@ -651,12 +680,11 @@ doswitch:
                         * This too is permitted by the standard....
                         */
                        goto doswitch;
                         * This too is permitted by the standard....
                         */
                        goto doswitch;

-                       break;

 
 

-               case ']':               /* end of scanset */
-                       return (fmt);
+               case ']':               /* end of scanset */
+                       return fmt;

 
 

-               default:                /* just another character */
+               default:                /* just another character */

                        c = n;
                        break;
                }
                        c = n;
                        break;
                }