From 4d69aeabd6e60afcdc7cca177ca751708ab79a9d Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 22 Aug 2014 17:48:27 +1000 Subject: [PATCH] - (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/ definition mismatch) and warning for broken/missing snprintf case. --- ChangeLog | 2 ++ openbsd-compat/bsd-snprintf.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26dfabde6..5bdf50aab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ - (djm) [configure.ac] include leading zero characters in OpenSSL version number; fixes test for unsupported versions - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC + - (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/ + definition mismatch) and warning for broken/missing snprintf case. 20140821 - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c index 975991e7f..23a635989 100644 --- a/openbsd-compat/bsd-snprintf.c +++ b/openbsd-compat/bsd-snprintf.c @@ -538,7 +538,7 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen, } while (*value && (cnt < max)) { DOPR_OUTCH(buffer, *currlen, maxlen, *value); - *value++; + value++; ++cnt; } while ((padlen < 0) && (cnt < max)) { @@ -553,7 +553,7 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen, static int fmtint(char *buffer, size_t *currlen, size_t maxlen, - LLONG value, int base, int min, int max, int flags) + intmax_t value, int base, int min, int max, int flags) { int signvalue = 0; unsigned LLONG uvalue;