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@cvs.openbsd.org 2013/11/21 03:16:47 

[regress/modpipe.c]
     use unsigned long long instead of u_int64_t here to avoid warnings
     on some systems portable OpenSSH is built on.
This commit is contained in:
Damien Miller 2013-11-21 14:25:15 +11:00
parent 36aba25b04
commit ea61b2179f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -43,6 +43,10 @@
- djm@cvs.openbsd.org 2013/11/21 03:15:46 - djm@cvs.openbsd.org 2013/11/21 03:15:46
[regress/krl.sh] [regress/krl.sh]
add some reminders for additional tests that I'd like to implement add some reminders for additional tests that I'd like to implement
- djm@cvs.openbsd.org 2013/11/21 03:16:47
[regress/modpipe.c]
use unsigned long long instead of u_int64_t here to avoid warnings
on some systems portable OpenSSH is built on.
20131110 20131110
- (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by

6
regress/modpipe.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: modpipe.c,v 1.5 2013/05/10 03:46:14 djm Exp $ */ /* $OpenBSD: modpipe.c,v 1.6 2013/11/21 03:16:47 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -68,7 +68,7 @@ usage(void)
#define MAX_MODIFICATIONS 256 #define MAX_MODIFICATIONS 256
struct modification { struct modification {
enum { MOD_XOR, MOD_AND_OR } what; enum { MOD_XOR, MOD_AND_OR } what;
u_int64_t offset; unsigned long long offset;
u_int8_t m1, m2; u_int8_t m1, m2;
}; };
@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m)
int n, m1, m2; int n, m1, m2;
bzero(m, sizeof(*m)); bzero(m, sizeof(*m));
if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%i%*[:]%i", if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%i%*[:]%i",
what, &m->offset, &m1, &m2)) < 3) what, &m->offset, &m1, &m2)) < 3)
errx(1, "Invalid modification spec \"%s\"", s); errx(1, "Invalid modification spec \"%s\"", s);
if (strcasecmp(what, "xor") == 0) { if (strcasecmp(what, "xor") == 0) {