summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2013-11-21 17:06:45 +0000
committerkrw <krw@openbsd.org>2013-11-21 17:06:45 +0000
commit413aee897c1b70ba63cf6455e4ee406379fcfa5d (patch)
tree2c61e5320bb146117e770e8dbca0d0cc535aff8e
parentDon't cast int64_t variables to (long long) when using %lld. (diff)
downloadwireguard-openbsd-413aee897c1b70ba63cf6455e4ee406379fcfa5d.tar.xz
wireguard-openbsd-413aee897c1b70ba63cf6455e4ee406379fcfa5d.zip
Cast daddr_t variable to (long long) even for %llx!
-rw-r--r--sys/dev/softraid_raid6.c5
-rw-r--r--sys/dev/softraid_raidp.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index d82cb2d902b..747e858060e 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.56 2013/11/21 16:34:50 krw Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.57 2013/11/21 17:06:45 krw Exp $ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -745,7 +745,8 @@ sr_raid6_addio(struct sr_workunit *wu, int chunk, daddr_t blkno,
struct sr_raid6_opaque *pqbuf;
DNPRINTF(SR_D_DIS, "sr_raid6_addio: %s %d.%llx %llx %p:%p\n",
- (xsflags & SCSI_DATA_IN) ? "read" : "write", chunk, blkno, len,
+ (xsflags & SCSI_DATA_IN) ? "read" : "write", chunk,
+ (long long)blkno, (long long)len,
pbuf, qbuf);
/* Allocate temporary buffer. */
diff --git a/sys/dev/softraid_raidp.c b/sys/dev/softraid_raidp.c
index 3f8f052ee3d..41b326d5895 100644
--- a/sys/dev/softraid_raidp.c
+++ b/sys/dev/softraid_raidp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raidp.c,v 1.54 2013/11/21 16:34:51 krw Exp $ */
+/* $OpenBSD: softraid_raidp.c,v 1.55 2013/11/21 17:06:45 krw Exp $ */
/*
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -577,8 +577,8 @@ sr_raidp_addio(struct sr_workunit *wu, int chunk, daddr_t blkno,
struct sr_ccb *ccb;
DNPRINTF(SR_D_DIS, "sr_raidp_addio: %s %d.%llx %llx %s\n",
- (xsflags & SCSI_DATA_IN) ? "read" : "write", chunk, blkno, len,
- xorbuf ? "X0R" : "-");
+ (xsflags & SCSI_DATA_IN) ? "read" : "write", chunk,
+ (long long)blkno, (long long)len, xorbuf ? "X0R" : "-");
/* Allocate temporary buffer. */
if (data == NULL) {