Module Name: src
Committed By: joerg
Date: Tue Nov 18 17:03:41 UTC 2014
Modified Files:
src/sys/dev/scsipi: scsipi_base.c
Log Message:
Use size for the size argument of memcmp, not the result of a compare.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/scsipi/scsipi_base.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.163 src/sys/dev/scsipi/scsipi_base.c:1.164
--- src/sys/dev/scsipi/scsipi_base.c:1.163 Mon Nov 17 18:43:48 2014
+++ src/sys/dev/scsipi/scsipi_base.c Tue Nov 18 17:03:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.163 2014/11/17 18:43:48 christos Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.163 2014/11/17 18:43:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $");
#include "opt_scsi.h"
@@ -1059,7 +1059,7 @@ scsipi_inquiry3_ok(const struct scsipi_i
const struct scsipi_inquiry3_pattern *q =
&scsipi_inquiry3_quirk[i];
#define MATCH(field) \
- (q->field[0] ? memcmp(ib->field, q->field, sizeof(ib->field) == 0) : 1)
+ (q->field[0] ? memcmp(ib->field, q->field, sizeof(ib->field)) == 0 : 1)
if (MATCH(vendor) && MATCH(product) && MATCH(revision))
return 0;
}
