Module Name: src
Committed By: martin
Date: Fri Oct 25 11:35:55 UTC 2013
Modified Files:
src/sys/dev/scsipi: cd.c
src/sys/dev/sdmmc: sdmmc_mem.c
src/sys/kern: kern_rndsink.c subr_kcpuset.c subr_vmem.c
src/sys/miscfs/genfs: genfs_io.c
src/sys/net/npf: npf_inet.c
src/sys/ufs/ffs: ffs_wapbl.c
Log Message:
Turn a few __unused into __diagused
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sdmmc/sdmmc_mem.c
cvs rdiff -u -r1.6 -r1.7 src/sys/kern/kern_rndsink.c
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/subr_kcpuset.c
cvs rdiff -u -r1.85 -r1.86 src/sys/kern/subr_vmem.c
cvs rdiff -u -r1.57 -r1.58 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.23 -r1.24 src/sys/net/npf/npf_inet.c
cvs rdiff -u -r1.24 -r1.25 src/sys/ufs/ffs/ffs_wapbl.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/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.315 src/sys/dev/scsipi/cd.c:1.316
--- src/sys/dev/scsipi/cd.c:1.315 Sat Oct 19 19:10:12 2013
+++ src/sys/dev/scsipi/cd.c Fri Oct 25 11:35:55 2013
@@ -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 @@ cdstart(struct scsipi_periph *periph)
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 "));
/*
Index: src/sys/dev/sdmmc/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.29 src/sys/dev/sdmmc/sdmmc_mem.c:1.30
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.29 Fri May 3 16:38:35 2013
+++ src/sys/dev/sdmmc/sdmmc_mem.c Fri Oct 25 11:35:55 2013
@@ -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 @@ static int
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 @@ static int
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;
Index: src/sys/kern/kern_rndsink.c
diff -u src/sys/kern/kern_rndsink.c:1.6 src/sys/kern/kern_rndsink.c:1.7
--- src/sys/kern/kern_rndsink.c:1.6 Sat Sep 14 20:47:48 2013
+++ src/sys/kern/kern_rndsink.c Fri Oct 25 11:35:55 2013
@@ -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 @@ rndpool_maybe_extract(void *buffer, size
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);
Index: src/sys/kern/subr_kcpuset.c
diff -u src/sys/kern/subr_kcpuset.c:1.9 src/sys/kern/subr_kcpuset.c:1.10
--- src/sys/kern/subr_kcpuset.c:1.9 Wed Jul 17 22:36:26 2013
+++ src/sys/kern/subr_kcpuset.c Fri Oct 25 11:35:55 2013
@@ -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 @@ kcpuset_unuse(kcpuset_t *kcp, kcpuset_t
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 @@ kcpuset_copyin(const cpuset_t *ucp, kcpu
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);
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.85 src/sys/kern/subr_vmem.c:1.86
--- src/sys/kern/subr_vmem.c:1.85 Mon Jul 22 19:43:54 2013
+++ src/sys/kern/subr_vmem.c Fri Oct 25 11:35:55 2013
@@ -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 @@ vmem_roundup_size(vmem_t *vm, vmem_size_
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);
Index: src/sys/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.57 src/sys/miscfs/genfs/genfs_io.c:1.58
--- src/sys/miscfs/genfs/genfs_io.c:1.57 Sat Oct 19 19:36:16 2013
+++ src/sys/miscfs/genfs/genfs_io.c Fri Oct 25 11:35:55 2013
@@ -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 @@ genfs_do_directio(struct vmspace *vs, va
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);
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.23 src/sys/net/npf/npf_inet.c:1.24
--- src/sys/net/npf/npf_inet.c:1.23 Fri Aug 23 10:37:03 2013
+++ src/sys/net/npf/npf_inet.c Fri Oct 25 11:35:55 2013
@@ -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 @@ again:
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);
Index: src/sys/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.24 src/sys/ufs/ffs/ffs_wapbl.c:1.25
--- src/sys/ufs/ffs/ffs_wapbl.c:1.24 Sun Oct 20 00:29:10 2013
+++ src/sys/ufs/ffs/ffs_wapbl.c Fri Oct 25 11:35:55 2013
@@ -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 @@ ffs_wapbl_sync_metadata(struct mount *mp
{
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");
