- 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.

diff --git a/ChangeLog b/ChangeLog
index 29ba4273b1b07af3d5f40e89c0fe803b2b593d13..377d359948ba1e027cd1d7d8c808342fe4b2d798 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 85747cf7d29e853d38eb79d7938deed03699a1c3..e854f9e0707df413a3932a65a758969f8ce1f23f 100755 (executable)
--- 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) {