[src/trunk]: src/sys Mark a diagnostic-only variable

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/007bb6ea11ef
branches:  trunk
changeset: 790870:007bb6ea11ef
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 25 16:01:56 2013 +0000

description:
Mark a diagnostic-only variable

diffstat:

 sys/dev/scsipi/sd.c         |  6 +++---
 sys/dev/scsipi/ss_mustek.c  |  6 +++---
 sys/dev/scsipi/ss_scanjet.c |  6 +++---
 sys/dev/scsipi/st.c         |  6 +++---
 sys/nfs/nfs_iod.c           |  6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diffs (135 lines):

diff -r a1fd16f4aff4 -r 007bb6ea11ef sys/dev/scsipi/sd.c
--- a/sys/dev/scsipi/sd.c       Fri Oct 25 16:00:35 2013 +0000
+++ b/sys/dev/scsipi/sd.c       Fri Oct 25 16:01:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.303 2013/09/28 09:01:36 skrll Exp $   */
+/*     $NetBSD: sd.c,v 1.304 2013/10/25 16:03:51 martin Exp $  */
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.303 2013/09/28 09:01:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.304 2013/10/25 16:03:51 martin Exp $");
 
 #include "opt_scsi.h"
 
@@ -773,7 +773,7 @@
        struct scsi_rw_6 cmd_small;
        struct scsipi_generic *cmdp;
        struct scsipi_xfer *xs;
-       int nblks, cmdlen, error, flags;
+       int nblks, cmdlen, error __diagused, flags;
 
        SC_DEBUG(periph, SCSIPI_DB2, ("sdstart "));
        /*
diff -r a1fd16f4aff4 -r 007bb6ea11ef sys/dev/scsipi/ss_mustek.c
--- a/sys/dev/scsipi/ss_mustek.c        Fri Oct 25 16:00:35 2013 +0000
+++ b/sys/dev/scsipi/ss_mustek.c        Fri Oct 25 16:01:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ss_mustek.c,v 1.41 2012/02/28 11:41:00 mbalmer Exp $   */
+/*     $NetBSD: ss_mustek.c,v 1.42 2013/10/25 16:04:57 martin Exp $    */
 
 /*
  * Copyright (c) 1995 Joachim Koenig-Baltes.  All rights reserved.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.41 2012/02/28 11:41:00 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.42 2013/10/25 16:04:57 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -451,7 +451,7 @@
        struct scsipi_xfer *xs;
        struct scsipi_periph *periph = ss->sc_periph;
        u_long lines_to_read;
-       int error;
+       int error __diagused;
 
        SC_DEBUG(periph, SCSIPI_DB1, ("mustek_read: start\n"));
 
diff -r a1fd16f4aff4 -r 007bb6ea11ef sys/dev/scsipi/ss_scanjet.c
--- a/sys/dev/scsipi/ss_scanjet.c       Fri Oct 25 16:00:35 2013 +0000
+++ b/sys/dev/scsipi/ss_scanjet.c       Fri Oct 25 16:01:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ss_scanjet.c,v 1.52 2012/02/28 11:41:00 mbalmer Exp $  */
+/*     $NetBSD: ss_scanjet.c,v 1.53 2013/10/25 16:05:47 martin Exp $   */
 
 /*
  * Copyright (c) 1995 Kenneth Stailey.  All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.52 2012/02/28 11:41:00 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.53 2013/10/25 16:05:47 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -253,7 +253,7 @@
        struct scsi_rw_scanner cmd;
        struct scsipi_xfer *xs;
        struct scsipi_periph *periph = ss->sc_periph;
-       int error;
+       int error __diagused;
 
        /* Fill out the scsi command */
        memset(&cmd, 0, sizeof(cmd));
diff -r a1fd16f4aff4 -r 007bb6ea11ef sys/dev/scsipi/st.c
--- a/sys/dev/scsipi/st.c       Fri Oct 25 16:00:35 2013 +0000
+++ b/sys/dev/scsipi/st.c       Fri Oct 25 16:01:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: st.c,v 1.221 2012/04/19 17:45:20 bouyer Exp $ */
+/*     $NetBSD: st.c,v 1.222 2013/10/25 16:06:44 martin Exp $ */
 
 /*-
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.221 2012/04/19 17:45:20 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.222 2013/10/25 16:06:44 martin Exp $");
 
 #include "opt_scsi.h"
 
@@ -1104,7 +1104,7 @@
        struct buf *bp;
        struct scsi_rw_tape cmd;
        struct scsipi_xfer *xs;
-       int flags, error;
+       int flags, error __diagused;
 
        SC_DEBUG(periph, SCSIPI_DB2, ("ststart "));
        /* See if there is a buf to do and we are not already  doing one */
diff -r a1fd16f4aff4 -r 007bb6ea11ef sys/nfs/nfs_iod.c
--- a/sys/nfs/nfs_iod.c Fri Oct 25 16:00:35 2013 +0000
+++ b/sys/nfs/nfs_iod.c Fri Oct 25 16:01:56 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_iod.c,v 1.5 2013/09/14 21:17:00 martin Exp $       */
+/*     $NetBSD: nfs_iod.c,v 1.6 2013/10/25 16:01:56 martin Exp $       */
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.5 2013/09/14 21:17:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_iod.c,v 1.6 2013/10/25 16:01:56 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -194,7 +194,7 @@
 void
 nfs_iodfini(void)
 {
-       int error;
+       int error __diagused;
 
        error = nfs_set_niothreads(0);
        KASSERT(error == 0);