summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
authorPedro Martelletto <pedro@cvs.openbsd.org>2006-12-29 13:04:38 +0000
committerPedro Martelletto <pedro@cvs.openbsd.org>2006-12-29 13:04:38 +0000
commitba02f4c341ab798b8da15c745fc34262ae5a5453 (patch)
tree9473fe40366c845b982fc8384589829f15cd5fe0 /sys/scsi
parentb7675ae17e9bbe19e88fdbe069031a9a676974c3 (diff)
Avoid void * arithmetic, okay deraadt@, suggestions from millert@
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/scsiconf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 1e77ffda3d3..388bd1fa500 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.123 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.124 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -869,12 +869,13 @@ bad:
* the patterns for the particular driver.
*/
const void *
-scsi_inqmatch(struct scsi_inquiry_data *inqbuf, const void *base, int nmatches,
- int matchsize, int *bestpriority)
+scsi_inqmatch(struct scsi_inquiry_data *inqbuf, const void *_base,
+ int nmatches, int matchsize, int *bestpriority)
{
u_int8_t type;
int removable;
const void *bestmatch;
+ const unsigned char *base = (const unsigned char *)_base;
/* Include the qualifier to catch vendor-unique types. */
type = inqbuf->device;