Turn a few __unused into __diagused trunk
authormartin <martin@NetBSD.org>
Fri, 25 Oct 2013 11:35:55 +0000
branchtrunk
changeset 221957 e177d8b67827
parent 221956 db7b6456e35d
child 221958 52eddb5adabe
Turn a few __unused into __diagused
sys/dev/scsipi/cd.c
sys/dev/sdmmc/sdmmc_mem.c
sys/kern/kern_rndsink.c
sys/kern/subr_kcpuset.c
sys/kern/subr_vmem.c
sys/miscfs/genfs/genfs_io.c
sys/net/npf/npf_inet.c
sys/ufs/ffs/ffs_wapbl.c
--- a/sys/dev/scsipi/cd.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/dev/scsipi/cd.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd.c,v 1.315 2013/10/19 19:10:12 martin Exp $	*/
+/*	$NetBSD: cd.c,v 1.316 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.315 2013/10/19 19:10:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.316 2013/10/25 11:35:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -748,7 +748,7 @@
 	struct scsi_rw_6 cmd_small;
 	struct scsipi_generic *cmdp;
 	struct scsipi_xfer *xs;
-	int flags, nblks, cmdlen, error __unused;
+	int flags, nblks, cmdlen, error __diagused;
 
 	SC_DEBUG(periph, SCSIPI_DB2, ("cdstart "));
 	/*
--- a/sys/dev/sdmmc/sdmmc_mem.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/dev/sdmmc/sdmmc_mem.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdmmc_mem.c,v 1.29 2013/05/03 16:38:35 matt Exp $	*/
+/*	$NetBSD: sdmmc_mem.c,v 1.30 2013/10/25 11:35:55 martin Exp $	*/
 /*	$OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $	*/
 
 /*
@@ -45,7 +45,7 @@
 /* Routines for SD/MMC memory cards. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.29 2013/05/03 16:38:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.30 2013/10/25 11:35:55 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1204,7 +1204,7 @@
 sdmmc_mem_single_read_block(struct sdmmc_function *sf, uint32_t blkno,
     u_char *data, size_t datalen)
 {
-	struct sdmmc_softc *sc __unused = sf->sc;
+	struct sdmmc_softc *sc __diagused = sf->sc;
 	int error = 0;
 	int i;
 
@@ -1391,7 +1391,7 @@
 sdmmc_mem_single_write_block(struct sdmmc_function *sf, uint32_t blkno,
     u_char *data, size_t datalen)
 {
-	struct sdmmc_softc *sc __unused = sf->sc;
+	struct sdmmc_softc *sc __diagused = sf->sc;
 	int error = 0;
 	int i;
 
--- a/sys/kern/kern_rndsink.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/kern/kern_rndsink.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rndsink.c,v 1.6 2013/09/14 20:47:48 martin Exp $	*/
+/*	$NetBSD: kern_rndsink.c,v 1.7 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.6 2013/09/14 20:47:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rndsink.c,v 1.7 2013/10/25 11:35:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -135,7 +135,7 @@
 
 	mutex_spin_enter(&rndpool_mtx);
 	if (bits_needed <= rndpool_get_entropy_count(&rnd_pool)) {
-		const uint32_t extracted __unused =
+		const uint32_t extracted __diagused =
 		    rndpool_extract_data(&rnd_pool, buffer, bytes,
 			RND_EXTRACT_GOOD);
 
--- a/sys/kern/subr_kcpuset.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/kern/subr_kcpuset.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_kcpuset.c,v 1.9 2013/07/17 22:36:26 matt Exp $	*/
+/*	$NetBSD: subr_kcpuset.c,v 1.10 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.9 2013/07/17 22:36:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.10 2013/10/25 11:35:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -282,7 +282,7 @@
 int
 kcpuset_copyin(const cpuset_t *ucp, kcpuset_t *kcp, size_t len)
 {
-	kcpuset_impl_t *kc __unused = KC_GETSTRUCT(kcp);
+	kcpuset_impl_t *kc __diagused = KC_GETSTRUCT(kcp);
 
 	KASSERT(kc_initialised);
 	KASSERT(kc->kc_refcnt > 0);
@@ -297,7 +297,7 @@
 int
 kcpuset_copyout(kcpuset_t *kcp, cpuset_t *ucp, size_t len)
 {
-	kcpuset_impl_t *kc __unused = KC_GETSTRUCT(kcp);
+	kcpuset_impl_t *kc __diagused = KC_GETSTRUCT(kcp);
 
 	KASSERT(kc_initialised);
 	KASSERT(kc->kc_refcnt > 0);
--- a/sys/kern/subr_vmem.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/kern/subr_vmem.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_vmem.c,v 1.85 2013/07/22 19:43:54 alnsn Exp $	*/
+/*	$NetBSD: subr_vmem.c,v 1.86 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.85 2013/07/22 19:43:54 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.86 2013/10/25 11:35:55 martin Exp $");
 
 #if defined(_KERNEL)
 #include "opt_ddb.h"
@@ -994,7 +994,7 @@
 int
 vmem_alloc(vmem_t *vm, vmem_size_t size, vm_flag_t flags, vmem_addr_t *addrp)
 {
-	const vm_flag_t strat __unused = flags & VM_FITMASK;
+	const vm_flag_t strat __diagused = flags & VM_FITMASK;
 
 	KASSERT((flags & (VM_SLEEP|VM_NOSLEEP)) != 0);
 	KASSERT((~flags & (VM_SLEEP|VM_NOSLEEP)) != 0);
--- a/sys/miscfs/genfs/genfs_io.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/miscfs/genfs/genfs_io.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: genfs_io.c,v 1.57 2013/10/19 19:36:16 martin Exp $	*/
+/*	$NetBSD: genfs_io.c,v 1.58 2013/10/25 11:35:55 martin Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.57 2013/10/19 19:36:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.58 2013/10/25 11:35:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1733,7 +1733,7 @@
 	vaddr_t kva, puva;
 	paddr_t pa;
 	vm_prot_t prot;
-	int error, rv __unused, poff, koff;
+	int error, rv __diagused, poff, koff;
 	const int pgoflags = PGO_CLEANIT | PGO_SYNCIO | PGO_JOURNALLOCKED |
 		(rw == UIO_WRITE ? PGO_FREE : 0);
 
--- a/sys/net/npf/npf_inet.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/net/npf/npf_inet.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_inet.c,v 1.23 2013/08/23 10:37:03 rmind Exp $	*/
+/*	$NetBSD: npf_inet.c,v 1.24 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.23 2013/08/23 10:37:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.24 2013/10/25 11:35:55 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -492,7 +492,7 @@
 void
 npf_recache(npf_cache_t *npc, nbuf_t *nbuf)
 {
-	const int mflags __unused = npc->npc_info & (NPC_IP46 | NPC_LAYER4);
+	const int mflags __diagused = npc->npc_info & (NPC_IP46 | NPC_LAYER4);
 	int flags;
 
 	nbuf_reset(nbuf);
--- a/sys/ufs/ffs/ffs_wapbl.c	Fri Oct 25 10:45:01 2013 +0000
+++ b/sys/ufs/ffs/ffs_wapbl.c	Fri Oct 25 11:35:55 2013 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_wapbl.c,v 1.24 2013/10/20 00:29:10 htodd Exp $	*/
+/*	$NetBSD: ffs_wapbl.c,v 1.25 2013/10/25 11:35:55 martin Exp $	*/
 
 /*-
  * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.24 2013/10/20 00:29:10 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.25 2013/10/25 11:35:55 martin Exp $");
 
 #define WAPBL_INTERNAL
 
@@ -165,7 +165,7 @@
 {
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct fs *fs = ump->um_fs;
-	int i, error __unused;
+	int i, error __diagused;
 
 #ifdef WAPBL_DEBUG_INODES
 	ufs_wapbl_verify_inodes(mp, "ffs_wapbl_sync_metadata");