diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-snprintf.c | 6 |
2 files changed, 8 insertions, 0 deletions
@@ -2,6 +2,8 @@ | |||
2 | - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the | 2 | - (djm) [openbsd-compat/bsd-snprintf.c] teach our local snprintf code the |
3 | 'j' (intmax_t/uintmax_t) and 'z' (size_t/ssize_t) conversions in case we | 3 | 'j' (intmax_t/uintmax_t) and 'z' (size_t/ssize_t) conversions in case we |
4 | start to use them in the future. | 4 | start to use them in the future. |
5 | - (djm) [openbsd-compat/bsd-snprintf.c] #ifdef noytet for intmax_t bits | ||
6 | until we have configure support. | ||
5 | 7 | ||
6 | 20130821 | 8 | 20130821 |
7 | - (djm) OpenBSD CVS Sync | 9 | - (djm) OpenBSD CVS Sync |
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c index 308078e0e..975991e7f 100644 --- a/openbsd-compat/bsd-snprintf.c +++ b/openbsd-compat/bsd-snprintf.c | |||
@@ -344,8 +344,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in) | |||
344 | value = (long)va_arg (args, unsigned LLONG); | 344 | value = (long)va_arg (args, unsigned LLONG); |
345 | else if (cflags == DP_C_SIZE) | 345 | else if (cflags == DP_C_SIZE) |
346 | value = va_arg (args, size_t); | 346 | value = va_arg (args, size_t); |
347 | #ifdef notyet | ||
347 | else if (cflags == DP_C_INTMAX) | 348 | else if (cflags == DP_C_INTMAX) |
348 | value = va_arg (args, uintmax_t); | 349 | value = va_arg (args, uintmax_t); |
350 | #endif | ||
349 | else | 351 | else |
350 | value = (long)va_arg (args, unsigned int); | 352 | value = (long)va_arg (args, unsigned int); |
351 | if (fmtint(buffer, &currlen, maxlen, value, | 353 | if (fmtint(buffer, &currlen, maxlen, value, |
@@ -362,8 +364,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in) | |||
362 | value = (LLONG)va_arg (args, unsigned LLONG); | 364 | value = (LLONG)va_arg (args, unsigned LLONG); |
363 | else if (cflags == DP_C_SIZE) | 365 | else if (cflags == DP_C_SIZE) |
364 | value = va_arg (args, size_t); | 366 | value = va_arg (args, size_t); |
367 | #ifdef notyet | ||
365 | else if (cflags == DP_C_INTMAX) | 368 | else if (cflags == DP_C_INTMAX) |
366 | value = va_arg (args, uintmax_t); | 369 | value = va_arg (args, uintmax_t); |
370 | #endif | ||
367 | else | 371 | else |
368 | value = (long)va_arg (args, unsigned int); | 372 | value = (long)va_arg (args, unsigned int); |
369 | if (fmtint(buffer, &currlen, maxlen, value, | 373 | if (fmtint(buffer, &currlen, maxlen, value, |
@@ -382,8 +386,10 @@ dopr(char *buffer, size_t maxlen, const char *format, va_list args_in) | |||
382 | value = (LLONG)va_arg (args, unsigned LLONG); | 386 | value = (LLONG)va_arg (args, unsigned LLONG); |
383 | else if (cflags == DP_C_SIZE) | 387 | else if (cflags == DP_C_SIZE) |
384 | value = va_arg (args, size_t); | 388 | value = va_arg (args, size_t); |
389 | #ifdef notyet | ||
385 | else if (cflags == DP_C_INTMAX) | 390 | else if (cflags == DP_C_INTMAX) |
386 | value = va_arg (args, uintmax_t); | 391 | value = va_arg (args, uintmax_t); |
392 | #endif | ||
387 | else | 393 | else |
388 | value = (long)va_arg (args, unsigned int); | 394 | value = (long)va_arg (args, unsigned int); |
389 | if (fmtint(buffer, &currlen, maxlen, value, | 395 | if (fmtint(buffer, &currlen, maxlen, value, |