diff options
| author | Damien Miller <djm@mindrot.org> | 2013-11-21 14:25:15 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2013-11-21 14:25:15 +1100 |
| commit | ea61b2179f63d48968dd2c9617621002bb658bfe (patch) | |
| tree | 91adabaf285795338d39145b530de2debeb45ea4 | |
| parent | 36aba25b0409d2db6afc84d54bc47a2532d38424 (diff) | |
| download | openssh-git-ea61b2179f63d48968dd2c9617621002bb658bfe.tar.gz | |
- 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.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | regress/modpipe.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -43,6 +43,10 @@ - djm@cvs.openbsd.org 2013/11/21 03:15:46 [regress/krl.sh] 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 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by diff --git a/regress/modpipe.c b/regress/modpipe.c index 85747cf7..e854f9e0 100755 --- a/regress/modpipe.c +++ b/regress/modpipe.c @@ -14,7 +14,7 @@ * 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" @@ -68,7 +68,7 @@ usage(void) #define MAX_MODIFICATIONS 256 struct modification { enum { MOD_XOR, MOD_AND_OR } what; - u_int64_t offset; + unsigned long long offset; u_int8_t m1, m2; }; @@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m) int n, m1, m2; 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) errx(1, "Invalid modification spec \"%s\"", s); if (strcasecmp(what, "xor") == 0) { |