Module Name: src
Committed By: christos
Date: Wed Aug 17 09:24:24 UTC 2011
Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c
src/external/bsd/iscsi/initiator: Makefile
Log Message:
fix strict aliasing issues.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/iscsi/initiator/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.7 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.8
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.7 Tue Feb 22 08:04:31 2011
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c Wed Aug 17 05:24:23 2011
@@ -163,12 +163,14 @@
iscsi_err(__FILE__, __LINE__, "READ_CAPACITY failed (status %#x)\n", args.status);
return -1;
}
- *maxlba = ISCSI_NTOHL(*((uint32_t *) (data)));
- *blocklen = ISCSI_NTOHL(*((uint32_t *) (data + 4)));
+ memcpy(maxlba, data, sizeof(*maxlba));
+ *maxlba = ISCSI_NTOHL(*maxlba);
if (*maxlba == 0) {
iscsi_err(__FILE__, __LINE__, "Device returned Maximum LBA of zero\n");
return -1;
}
+ memcpy(blocklen, data + 4, sizeof(*blocklen));
+ *blocklen = ISCSI_NTOHL(*blocklen);
if (*blocklen % 2) {
iscsi_err(__FILE__, __LINE__, "Device returned strange block len: %u\n", *blocklen);
return -1;
Index: src/external/bsd/iscsi/initiator/Makefile
diff -u src/external/bsd/iscsi/initiator/Makefile:1.4 src/external/bsd/iscsi/initiator/Makefile:1.5
--- src/external/bsd/iscsi/initiator/Makefile:1.4 Tue Jun 21 22:49:42 2011
+++ src/external/bsd/iscsi/initiator/Makefile Wed Aug 17 05:24:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/22 02:49:42 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/17 09:24:23 christos Exp $
.sinclude "${.CURDIR}/../Makefile.inc"
@@ -26,8 +26,3 @@
.endif
.include <bsd.prog.mk>
-
-# XXX
-.if ${HAVE_GCC} == 45
-COPTS.iscsi-initiator.c+= -fno-strict-aliasing
-.endif
