diff options
| author | rillig <rillig@pkgsrc.org> | 2007-09-12 21:05:29 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-09-12 21:05:29 +0000 |
| commit | 0b718629a6c2834512815f098f4602cdcf1f8705 (patch) | |
| tree | 4ed77d684a8246166a020af982bca01a0a069bf0 | |
| parent | e1bab234ab6e84a779ae8578bd4d1e1056577d57 (diff) | |
| download | pkgsrc-0b718629a6c2834512815f098f4602cdcf1f8705.tar.gz | |
Fixed gcc error message:
scsi.c:1047: warning: dereferencing 'void *' pointer
scsi.c:1047: error: void value not ignored as it ought to be
The reason is that scsireq_t->data has now (NetBSD 4.99.30) the type
void *, which seems to have been char * before.
| -rw-r--r-- | devel/libscsi/distinfo | 4 | ||||
| -rw-r--r-- | devel/libscsi/patches/patch-ad | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/devel/libscsi/distinfo b/devel/libscsi/distinfo index 5282a0460e0..fc44c53e965 100644 --- a/devel/libscsi/distinfo +++ b/devel/libscsi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 22:24:19 agc Exp $ +$NetBSD: distinfo,v 1.6 2007/09/12 21:05:29 rillig Exp $ SHA1 (libscsi-1.6.tar.gz) = 8d6d47d2baa5e272e09ac5ee1330dd37461e922f RMD160 (libscsi-1.6.tar.gz) = 586e0b73777a6be41f075c2b6f4fb73c81d7fa03 @@ -6,4 +6,4 @@ Size (libscsi-1.6.tar.gz) = 11896 bytes SHA1 (patch-aa) = d34b6769997c3fe29b99d0465710bd3c5d9bcda8 SHA1 (patch-ab) = 8b6894ca7084605d67a3b01dba06bab51e6c0bfa SHA1 (patch-ac) = 26234441505ad213642692f5b705e166c48eba47 -SHA1 (patch-ad) = 115477329d0fb8e79411f6c20f81d24718d7ac27 +SHA1 (patch-ad) = 7772f992e3df11b0461db33c91ff570f90ea82db diff --git a/devel/libscsi/patches/patch-ad b/devel/libscsi/patches/patch-ad index ad88ecf5e5a..99f112a8d82 100644 --- a/devel/libscsi/patches/patch-ad +++ b/devel/libscsi/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1 1999/01/24 06:02:13 mycroft Exp $ +$NetBSD: patch-ad,v 1.2 2007/09/12 21:05:30 rillig Exp $ ---- scsi.c.orig Sat Jan 23 17:52:33 1999 -+++ scsi.c Sun Jan 24 00:47:43 1999 +--- scsi.c.orig 2007-09-12 21:25:59.000000000 +0200 ++++ scsi.c 2007-09-12 21:29:07.000000000 +0200 @@ -37,7 +37,7 @@ #include <ctype.h> #include <string.h> @@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.1 1999/01/24 06:02:13 mycroft Exp $ #include <stdarg.h> #include <fcntl.h> +@@ -1044,7 +1044,7 @@ static void sense_7x_dump(FILE *f, scsir + fprintf(f, "Illegal value in the %s.\n", + (bad_par ? "parameter list" : "command descriptor block")); + byte = ((s[16] << 8) | s[17]); +- value = bad_par ? (u_char)scsireq->databuf[byte] : (u_char)scsireq->cmd[byte]; ++ value = ((u_char *)(bad_par ? scsireq->databuf : scsireq->cmd))[byte]; + bit = s[15] & 0x7; + if (s[15] & 0x08) + fprintf(f, "Bit %d of byte %d (value %02x) is illegal.\n", |