summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2013-11-21 03:16:48 +0000
committerDamien Miller <djm@cvs.openbsd.org>2013-11-21 03:16:48 +0000
commit1f515967b24fc8bf24240b21cccd97fd6ee106e5 (patch)
treee3e67f5506f2a0cd2617f3ddcbe8f71d7595b850 /regress
parent6431a6a9fb37b384c1819302e8c3bc81e3cbf36c (diff)
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')
-rwxr-xr-xregress/usr.bin/ssh/modpipe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/usr.bin/ssh/modpipe.c b/regress/usr.bin/ssh/modpipe.c
index d6394c1eb9f..ae139a6daba 100755
--- a/regress/usr.bin/ssh/modpipe.c
+++ b/regress/usr.bin/ssh/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 <sys/types.h>
#include <unistd.h>
@@ -37,7 +37,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;
};
@@ -48,7 +48,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) {