summaryrefslogtreecommitdiff
path: root/regress/modpipe.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-11-21 14:25:15 +1100
committerDamien Miller <djm@mindrot.org>2013-11-21 14:25:15 +1100
commitea61b2179f63d48968dd2c9617621002bb658bfe (patch)
tree91adabaf285795338d39145b530de2debeb45ea4 /regress/modpipe.c
parent36aba25b0409d2db6afc84d54bc47a2532d38424 (diff)
- 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.
Diffstat (limited to 'regress/modpipe.c')
-rwxr-xr-xregress/modpipe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/modpipe.c b/regress/modpipe.c
index 85747cf7d..e854f9e07 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -14,7 +14,7 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16 16
17/* $OpenBSD: modpipe.c,v 1.5 2013/05/10 03:46:14 djm Exp $ */ 17/* $OpenBSD: modpipe.c,v 1.6 2013/11/21 03:16:47 djm Exp $ */
18 18
19#include "includes.h" 19#include "includes.h"
20 20
@@ -68,7 +68,7 @@ usage(void)
68#define MAX_MODIFICATIONS 256 68#define MAX_MODIFICATIONS 256
69struct modification { 69struct modification {
70 enum { MOD_XOR, MOD_AND_OR } what; 70 enum { MOD_XOR, MOD_AND_OR } what;
71 u_int64_t offset; 71 unsigned long long offset;
72 u_int8_t m1, m2; 72 u_int8_t m1, m2;
73}; 73};
74 74
@@ -79,7 +79,7 @@ parse_modification(const char *s, struct modification *m)
79 int n, m1, m2; 79 int n, m1, m2;
80 80
81 bzero(m, sizeof(*m)); 81 bzero(m, sizeof(*m));
82 if ((n = sscanf(s, "%16[^:]%*[:]%lli%*[:]%i%*[:]%i", 82 if ((n = sscanf(s, "%16[^:]%*[:]%llu%*[:]%i%*[:]%i",
83 what, &m->offset, &m1, &m2)) < 3) 83 what, &m->offset, &m1, &m2)) < 3)
84 errx(1, "Invalid modification spec \"%s\"", s); 84 errx(1, "Invalid modification spec \"%s\"", s);
85 if (strcasecmp(what, "xor") == 0) { 85 if (strcasecmp(what, "xor") == 0) {