tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [openbsd-compat/bsd-snprintf.c] Fix compilation failure (prototype/ 

definition mismatch) and warning for broken/missing snprintf case.
This commit is contained in:
Damien Miller 2014-08-22 17:48:27 +10:00
parent 0c11f1ac36
commit 4d69aeabd6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
- (djm) [configure.ac] include leading zero characters in OpenSSL version - (djm) [configure.ac] include leading zero characters in OpenSSL version
number; fixes test for unsupported versions number; fixes test for unsupported versions
- (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC - (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 20140821
- (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too. - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.

4
openbsd-compat/bsd-snprintf.c
View File

@ -538,7 +538,7 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen,
} }
while (*value && (cnt < max)) { while (*value && (cnt < max)) {
DOPR_OUTCH(buffer, *currlen, maxlen, *value); DOPR_OUTCH(buffer, *currlen, maxlen, *value);
*value++; value++;
++cnt; ++cnt;
} }
while ((padlen < 0) && (cnt < max)) { while ((padlen < 0) && (cnt < max)) {
@ -553,7 +553,7 @@ fmtstr(char *buffer, size_t *currlen, size_t maxlen,
static int static int
fmtint(char *buffer, size_t *currlen, size_t maxlen, 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; int signvalue = 0;
unsigned LLONG uvalue; unsigned LLONG uvalue;