Module Name: src
Committed By: mrg
Date: Wed Oct 30 08:41:38 UTC 2013
Modified Files:
src/sys/fs/udf: udf_allocation.c udf_strat_direct.c udf_strat_rmw.c
src/sys/net/npf: npf_inet.c
Log Message:
used __diagused where appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/udf/udf_allocation.c
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/udf/udf_strat_direct.c
cvs rdiff -u -r1.23 -r1.24 src/sys/fs/udf/udf_strat_rmw.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/npf/npf_inet.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/fs/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.35 src/sys/fs/udf/udf_allocation.c:1.36
--- src/sys/fs/udf/udf_allocation.c:1.35 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_allocation.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.36 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.35 2013/10/18 19:56:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.36 2013/10/30 08:41:38 mrg Exp $");
#endif /* not lint */
@@ -1157,7 +1157,7 @@ udf_allocate_space(struct udf_mount *ump
struct logvol_int_desc *lvid;
uint64_t *lmappos;
uint32_t ptov, lb_num, *freepos, free_lbs;
- int lb_size, alloc_num_lb;
+ int lb_size __diagused, alloc_num_lb;
int alloc_type, error;
int is_node;
@@ -1307,7 +1307,7 @@ udf_free_allocated_space(struct udf_moun
uint32_t lb_map, udf_rw32_lbmap;
uint32_t *freepos, free_lbs;
int phys_part;
- int error;
+ int error __diagused;
DPRINTF(ALLOC, ("udf_free_allocated_space: freeing virt lbnum %d "
"part %d + %d sect\n", lb_num, vpart_num, num_lb));
@@ -1473,7 +1473,7 @@ udf_trunc_metadatapart(struct udf_mount
uint32_t *freepos, *sizepos;
uint32_t unit, lb_size;
uint16_t meta_vpart_num, data_vpart_num, num_vpart;
- int err;
+ int err __diagused;
unit = ump->metadata_alloc_unit_size;
lb_size = udf_rw32(ump->logical_vol->lb_size);
Index: src/sys/fs/udf/udf_strat_direct.c
diff -u src/sys/fs/udf/udf_strat_direct.c:1.11 src/sys/fs/udf/udf_strat_direct.c:1.12
--- src/sys/fs/udf/udf_strat_direct.c:1.11 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_strat_direct.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_strat_direct.c,v 1.12 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.11 2013/10/18 19:56:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_direct.c,v 1.12 2013/10/30 08:41:38 mrg Exp $");
#endif /* not lint */
@@ -193,7 +193,7 @@ udf_write_nodedscr_direct(struct udf_str
struct long_ad *icb = args->icb;
int waitfor = args->waitfor;
uint32_t logsector, sector, dummy;
- int error, vpart;
+ int error, vpart __diagused;
/*
* we have to decide if we write it out sequential or at its fixed
@@ -255,7 +255,7 @@ udf_queue_buf_direct(struct udf_strat_ar
int sector_size = ump->discinfo.sector_size;
int len, buf_len, sector, sectors, run_length;
int blks = sector_size / DEV_BSIZE;
- int what, class, queue;
+ int what, class __diagused, queue;
KASSERT(ump);
KASSERT(buf);
Index: src/sys/fs/udf/udf_strat_rmw.c
diff -u src/sys/fs/udf/udf_strat_rmw.c:1.23 src/sys/fs/udf/udf_strat_rmw.c:1.24
--- src/sys/fs/udf/udf_strat_rmw.c:1.23 Fri Oct 18 19:56:55 2013
+++ src/sys/fs/udf/udf_strat_rmw.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $ */
+/* $NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.23 2013/10/18 19:56:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_strat_rmw.c,v 1.24 2013/10/30 08:41:38 mrg Exp $");
#endif /* not lint */
@@ -345,7 +345,7 @@ udf_pop_eccline(struct strat_private *pr
static void
udf_unqueue_eccline(struct strat_private *priv, struct udf_eccline *eccline)
{
- struct buf *ret;
+ struct buf *ret __diagused;
UDF_LOCK_ECCLINE(eccline);
if (eccline->queued_on == 0) {
Index: src/sys/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.24 src/sys/net/npf/npf_inet.c:1.25
--- src/sys/net/npf/npf_inet.c:1.24 Fri Oct 25 11:35:55 2013
+++ src/sys/net/npf/npf_inet.c Wed Oct 30 08:41:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.24 2013/10/25 11:35:55 martin Exp $ */
+/* $NetBSD: npf_inet.c,v 1.25 2013/10/30 08:41:38 mrg 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.24 2013/10/25 11:35:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_inet.c,v 1.25 2013/10/30 08:41:38 mrg Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -493,7 +493,7 @@ void
npf_recache(npf_cache_t *npc, nbuf_t *nbuf)
{
const int mflags __diagused = npc->npc_info & (NPC_IP46 | NPC_LAYER4);
- int flags;
+ int flags __diagused;
nbuf_reset(nbuf);
npc->npc_info = 0;
