Module Name: src
Committed By: ryoon
Date: Mon Jun 17 17:14:56 UTC 2019
Modified Files:
src/sys/ufs/chfs: chfs_malloc.c chfs_pool.c chfs_scan.c chfs_vnops.c
Log Message:
Fix build without DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_malloc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_pool.c
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/chfs/chfs_scan.c
cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/chfs/chfs_vnops.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/ufs/chfs/chfs_malloc.c
diff -u src/sys/ufs/chfs/chfs_malloc.c:1.5 src/sys/ufs/chfs/chfs_malloc.c:1.6
--- src/sys/ufs/chfs/chfs_malloc.c:1.5 Thu Nov 9 22:16:38 2017
+++ src/sys/ufs/chfs/chfs_malloc.c Mon Jun 17 17:14:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_malloc.c,v 1.5 2017/11/09 22:16:38 christos Exp $ */
+/* $NetBSD: chfs_malloc.c,v 1.6 2019/06/17 17:14:56 ryoon Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -218,7 +218,7 @@ chfs_free_refblock(struct chfs_node_ref
struct chfs_node_ref*
chfs_alloc_node_ref(struct chfs_eraseblock *cheb)
{
- struct chfs_node_ref *nref, *new, *old;
+ struct chfs_node_ref *nref, *new, *old __diagused;
old = cheb->last_node;
nref = cheb->last_node;
Index: src/sys/ufs/chfs/chfs_pool.c
diff -u src/sys/ufs/chfs/chfs_pool.c:1.3 src/sys/ufs/chfs/chfs_pool.c:1.4
--- src/sys/ufs/chfs/chfs_pool.c:1.3 Mon Jan 29 15:48:50 2018
+++ src/sys/ufs/chfs/chfs_pool.c Mon Jun 17 17:14:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_pool.c,v 1.3 2018/01/29 15:48:50 sevan Exp $ */
+/* $NetBSD: chfs_pool.c,v 1.4 2019/06/17 17:14:56 ryoon Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -62,7 +62,7 @@ void
chfs_pool_init(struct chfs_pool *chpp, size_t size, const char *what,
struct chfs_mount *chmp)
{
- int cnt;
+ int cnt __diagused;
cnt = snprintf(chpp->chp_name, sizeof(chpp->chp_name),
"%s_chfs_%p", what, chmp);
Index: src/sys/ufs/chfs/chfs_scan.c
diff -u src/sys/ufs/chfs/chfs_scan.c:1.7 src/sys/ufs/chfs/chfs_scan.c:1.8
--- src/sys/ufs/chfs/chfs_scan.c:1.7 Thu Jun 1 02:45:15 2017
+++ src/sys/ufs/chfs/chfs_scan.c Mon Jun 17 17:14:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_scan.c,v 1.7 2017/06/01 02:45:15 chs Exp $ */
+/* $NetBSD: chfs_scan.c,v 1.8 2019/06/17 17:14:56 ryoon Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -178,7 +178,7 @@ int
chfs_scan_mark_dirent_obsolete(struct chfs_mount *chmp,
struct chfs_vnode_cache *vc, struct chfs_dirent *fd)
{
- struct chfs_eraseblock *cheb;
+ struct chfs_eraseblock *cheb __diagused;
struct chfs_node_ref *prev, *nref;
nref = fd->nref;
Index: src/sys/ufs/chfs/chfs_vnops.c
diff -u src/sys/ufs/chfs/chfs_vnops.c:1.33 src/sys/ufs/chfs/chfs_vnops.c:1.34
--- src/sys/ufs/chfs/chfs_vnops.c:1.33 Fri May 26 14:21:02 2017
+++ src/sys/ufs/chfs/chfs_vnops.c Mon Jun 17 17:14:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_vnops.c,v 1.33 2017/05/26 14:21:02 riastradh Exp $ */
+/* $NetBSD: chfs_vnops.c,v 1.34 2019/06/17 17:14:56 ryoon Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -60,7 +60,7 @@ chfs_lookup(void *v)
struct chfs_inode* ip;
struct ufsmount* ump;
struct chfs_mount* chmp;
- struct chfs_vnode_cache* chvc;
+ struct chfs_vnode_cache* chvc __diagused;
struct chfs_dirent* fd;
dbg("lookup(): %s\n", cnp->cn_nameptr);
