[src/trunk]: src/external/cddl/osnet/dist/uts/common/dtrace Fix build of DTra...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc9123e7708d
branches:  trunk
changeset: 794154:fc9123e7708d
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Fri Mar 07 02:37:16 2014 +0000

description:
Fix build of DTrace with GCC 4.8

Use __diagused for a variable which is only referred by KASSERT.

Advised by matt@

diffstat:

 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r fd3e9be4e764 -r fc9123e7708d external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Fri Mar 07 02:03:32 2014 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Fri Mar 07 02:37:16 2014 +0000
@@ -16655,7 +16655,7 @@
     hrtime_t interval)
 {
        struct dtrace_state_worker *w;
-       int error;
+       int error __diagused;
 
        w = kmem_alloc(sizeof(*w), KM_SLEEP);
        mutex_init(&w->lock, MUTEX_DEFAULT, IPL_NONE);
@@ -16666,7 +16666,6 @@
        w->exiting = false;
        error = kthread_create(PRI_NONE, KTHREAD_MPSAFE|KTHREAD_MUSTJOIN, NULL,
            dtrace_state_worker_thread, w, &w->lwp, "dtrace-state-worker");
-       (void) error;
        KASSERT(error == 0); /* XXX */
        return w;
 }
@@ -16674,7 +16673,7 @@
 void
 dtrace_state_worker_remove(struct dtrace_state_worker *w)
 {
-       int error;
+       int error __diagused;
 
        KASSERT(!w->exiting);
        mutex_enter(&w->lock);