diff options
author | djm <djm> | 2014-08-22 07:48:27 +0000 |
---|---|---|
committer | djm <djm> | 2014-08-22 07:48:27 +0000 |
commit | a90da2067387ff63f218a5e9c10259def2d1a4d4 (patch) | |
tree | 6b1a4d401c008c58b56d58e17f55e96132791c2f | |
parent | 49680f59ab6c8fb9763ba4cd5f2f6b35da750362 (diff) | |
download | openssh-a90da2067387ff63f218a5e9c10259def2d1a4d4.tar.gz |
- (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/
definition mismatch) and warning for broken/missing snprintf case.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | openbsd-compat/bsd-snprintf.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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 975991e7..23a63598 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; |