Imported Upstream version 1.7.6p1

[debian/sudo] / snprintf.c

diff --git a/snprintf.c b/snprintf.c
index 4123a9d77464fcc8ea6c0ff0e94a65372b50816f..303523232d9a872c28bffe78b943ca82ca4ba5cf 100644 (file)
--- a/snprintf.c
+++ b/snprintf.c
@@ -76,7 +76,7 @@
 # include <varargs.h>
 #endif
 
-#include <compat.h>
+#include "missing.h"
 
 static int xxxprintf    __P((char **, size_t, int, const char *, va_list));
 
@@ -139,10 +139,10 @@ memchr(s, c, n)
 
                do {
                        if (*p++ == c)
-                               return ((void *)(p - 1));
+                               return (void *)(p - 1);
                } while (--n != 0);
        }
-       return (NULL);
+       return NULL;
 }
 #endif /* !HAVE_MEMCHR */
 
@@ -170,7 +170,7 @@ __ultoa(val, endp, base, octzero, xdigs)
        case 10:
                if (val < 10) { /* many numbers are 1 digit */
                        *--cp = to_char(val);
-                       return (cp);
+                       return cp;
                }
                /*
                 * On many machines, unsigned arithmetic is harder than
@@ -208,7 +208,7 @@ __ultoa(val, endp, base, octzero, xdigs)
        default:                        /* oops */
                abort();
        }
-       return (cp);
+       return cp;
 }
 
 /* Identical to __ultoa, but for quads. */
@@ -229,12 +229,12 @@ __uqtoa(val, endp, base, octzero, xdigs)
        /* quick test for small values; __ultoa is typically much faster */
        /* (perhaps instead we should run until small, then call __ultoa?) */
        if (val <= (unsigned long long)ULONG_MAX)
-               return (__ultoa((unsigned long)val, endp, base, octzero, xdigs));
+               return __ultoa((unsigned long)val, endp, base, octzero, xdigs);
        switch (base) {
        case 10:
                if (val < 10) {
                        *--cp = to_char(val % 10);
-                       return (cp);
+                       return cp;
                }
                if (val > LLONG_MAX) {
                        *--cp = to_char(val % 10);
@@ -266,7 +266,7 @@ __uqtoa(val, endp, base, octzero, xdigs)
        default:                        /* oops */
                abort();
        }
-       return (cp);
+       return cp;
 }
 # endif /* !SIZEOF_LONG_INT */
 #endif /* HAVE_LONG_LONG_INT */
@@ -291,16 +291,16 @@ xxxprintf(strp, strsize, alloc, fmt0, ap)
        int width;              /* width from format (%8d), or 0 */
        int prec;               /* precision from format (%.3d), or -1 */
        char sign;              /* sign prefix (' ', '+', '-', or \0) */
-       unsigned long ulval;    /* integer arguments %[diouxX] */
+       unsigned long ulval = 0; /* integer arguments %[diouxX] */
 #ifdef HAVE_LONG_LONG_INT
-       unsigned long long uqval; /* %q (quad) integers */
+       unsigned long long uqval = 0; /* %q (quad) integers */
 #endif
        int base;               /* base for [diouxX] conversion */
        int dprec;              /* a copy of prec if [diouxX], 0 otherwise */
        int fieldsz;            /* field size expanded by sign, etc */
        int realsz;             /* field size expanded by dprec */
        int size;               /* size of converted field or string */
-       char *xdigs;            /* digits for [xX] conversion */
+       char *xdigs = "";       /* digits for [xX] conversion */
        char buf[BUF];          /* space for %c, %[diouxX], %[eEfgG] */
        char ox[2];             /* space for 0x hex-prefix */
        char *str;              /* pointer to string to fill */
@@ -340,13 +340,13 @@ xxxprintf(strp, strsize, alloc, fmt0, ap)
 } while (0)
 
        /* BEWARE, PAD uses `n'. */
-#define        PAD(howmany, with) do { \
-       if ((n = (howmany)) > 0) { \
+#define        PAD(plen, pstr) do { \
+       if ((n = (plen)) > 0) { \
                while (n > PADSIZE) { \
-                       PRINT(with, PADSIZE); \
+                       PRINT(pstr, PADSIZE); \
                        n -= PADSIZE; \
                } \
-               PRINT(with, n); \
+               PRINT(pstr, n); \
        } \
 } while (0)
 
@@ -693,7 +693,7 @@ number:                     if ((dprec = prec) >= 0)
 done:
        if (strsize)
                *str = '\0';
-       return (ret);
+       return ret;
        /* NOTREACHED */
 }
 
@@ -706,7 +706,7 @@ vsnprintf(str, n, fmt, ap)
        va_list ap;
 {
 
-       return (xxxprintf(&str, n, 0, fmt, ap));
+       return xxxprintf(&str, n, 0, fmt, ap);
 }
 #endif /* HAVE_VSNPRINTF */
 
@@ -732,7 +732,7 @@ snprintf(str, n, fmt, va_alist)
 #endif
        ret = xxxprintf(&str, n, 0, fmt, ap);
        va_end(ap);
-       return (ret);
+       return ret;
 }
 #endif /* HAVE_SNPRINTF */
 
@@ -744,7 +744,7 @@ vasprintf(str, fmt, ap)
        va_list ap;
 {
 
-       return (xxxprintf(str, 0, 1, fmt, ap));
+       return xxxprintf(str, 0, 1, fmt, ap);
 }
 #endif /* HAVE_VASPRINTF */
 
@@ -769,6 +769,6 @@ asprintf(str, fmt, va_alist)
 #endif
        ret = xxxprintf(str, 0, 1, fmt, ap);
        va_end(ap);
-       return (ret);
+       return ret;
 }
 #endif /* HAVE_ASPRINTF */