|
@@ -4,6 +4,7 @@
|
|
#include <limits.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
#include <stdarg.h>
|
|
|
|
+#include <stddef.h>
|
|
#include <wchar.h>
|
|
#include <wchar.h>
|
|
#include <inttypes.h>
|
|
#include <inttypes.h>
|
|
#include <math.h>
|
|
#include <math.h>
|
|
@@ -26,14 +27,6 @@
|
|
|
|
|
|
#define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED)
|
|
#define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED)
|
|
|
|
|
|
-#if UINT_MAX == ULONG_MAX
|
|
|
|
-#define LONG_IS_INT
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
-#if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX
|
|
|
|
-#define ODD_TYPES
|
|
|
|
-#endif
|
|
|
|
-
|
|
|
|
/* State machine to accept length modifiers + conversion specifiers.
|
|
/* State machine to accept length modifiers + conversion specifiers.
|
|
* Result is 0 on failure, or an argument type to pop on success. */
|
|
* Result is 0 on failure, or an argument type to pop on success. */
|
|
|
|
|
|
@@ -42,23 +35,9 @@ enum {
|
|
ZTPRE, JPRE,
|
|
ZTPRE, JPRE,
|
|
STOP,
|
|
STOP,
|
|
PTR, INT, UINT, ULLONG,
|
|
PTR, INT, UINT, ULLONG,
|
|
-#ifndef LONG_IS_INT
|
|
|
|
LONG, ULONG,
|
|
LONG, ULONG,
|
|
-#else
|
|
|
|
-#define LONG INT
|
|
|
|
-#define ULONG UINT
|
|
|
|
-#endif
|
|
|
|
SHORT, USHORT, CHAR, UCHAR,
|
|
SHORT, USHORT, CHAR, UCHAR,
|
|
-#ifdef ODD_TYPES
|
|
|
|
LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR,
|
|
LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR,
|
|
-#else
|
|
|
|
-#define LLONG ULLONG
|
|
|
|
-#define SIZET ULONG
|
|
|
|
-#define IMAX LLONG
|
|
|
|
-#define UMAX ULLONG
|
|
|
|
-#define PDIFF LONG
|
|
|
|
-#define UIPTR ULONG
|
|
|
|
-#endif
|
|
|
|
DBL, LDBL,
|
|
DBL, LDBL,
|
|
NOARG,
|
|
NOARG,
|
|
MAXSTATE
|
|
MAXSTATE
|
|
@@ -134,23 +113,19 @@ static void pop_arg(union arg *arg, int type, va_list *ap)
|
|
case PTR: arg->p = va_arg(*ap, void *);
|
|
case PTR: arg->p = va_arg(*ap, void *);
|
|
break; case INT: arg->i = va_arg(*ap, int);
|
|
break; case INT: arg->i = va_arg(*ap, int);
|
|
break; case UINT: arg->i = va_arg(*ap, unsigned int);
|
|
break; case UINT: arg->i = va_arg(*ap, unsigned int);
|
|
-#ifndef LONG_IS_INT
|
|
|
|
break; case LONG: arg->i = va_arg(*ap, long);
|
|
break; case LONG: arg->i = va_arg(*ap, long);
|
|
break; case ULONG: arg->i = va_arg(*ap, unsigned long);
|
|
break; case ULONG: arg->i = va_arg(*ap, unsigned long);
|
|
-#endif
|
|
|
|
break; case ULLONG: arg->i = va_arg(*ap, unsigned long long);
|
|
break; case ULLONG: arg->i = va_arg(*ap, unsigned long long);
|
|
break; case SHORT: arg->i = (short)va_arg(*ap, int);
|
|
break; case SHORT: arg->i = (short)va_arg(*ap, int);
|
|
break; case USHORT: arg->i = (unsigned short)va_arg(*ap, int);
|
|
break; case USHORT: arg->i = (unsigned short)va_arg(*ap, int);
|
|
break; case CHAR: arg->i = (signed char)va_arg(*ap, int);
|
|
break; case CHAR: arg->i = (signed char)va_arg(*ap, int);
|
|
break; case UCHAR: arg->i = (unsigned char)va_arg(*ap, int);
|
|
break; case UCHAR: arg->i = (unsigned char)va_arg(*ap, int);
|
|
-#ifdef ODD_TYPES
|
|
|
|
break; case LLONG: arg->i = va_arg(*ap, long long);
|
|
break; case LLONG: arg->i = va_arg(*ap, long long);
|
|
break; case SIZET: arg->i = va_arg(*ap, size_t);
|
|
break; case SIZET: arg->i = va_arg(*ap, size_t);
|
|
break; case IMAX: arg->i = va_arg(*ap, intmax_t);
|
|
break; case IMAX: arg->i = va_arg(*ap, intmax_t);
|
|
break; case UMAX: arg->i = va_arg(*ap, uintmax_t);
|
|
break; case UMAX: arg->i = va_arg(*ap, uintmax_t);
|
|
break; case PDIFF: arg->i = va_arg(*ap, ptrdiff_t);
|
|
break; case PDIFF: arg->i = va_arg(*ap, ptrdiff_t);
|
|
break; case UIPTR: arg->i = (uintptr_t)va_arg(*ap, void *);
|
|
break; case UIPTR: arg->i = (uintptr_t)va_arg(*ap, void *);
|
|
-#endif
|
|
|
|
break; case DBL: arg->f = va_arg(*ap, double);
|
|
break; case DBL: arg->f = va_arg(*ap, double);
|
|
break; case LDBL: arg->f = va_arg(*ap, long double);
|
|
break; case LDBL: arg->f = va_arg(*ap, long double);
|
|
}
|
|
}
|