[src/trunk]: src/external/cddl/osnet Fix build of DTrace with GCC 4.8.

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e07a461b0a20
branches:  trunk
changeset: 327356:e07a461b0a20
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Mar 05 20:14:15 2014 +0000

description:
Fix build of DTrace with GCC 4.8.

diffstat:

 external/cddl/osnet/dev/fbt/fbt.c                   |  8 +-------
 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c |  1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r 2e6e61fedefd -r e07a461b0a20 external/cddl/osnet/dev/fbt/fbt.c
--- a/external/cddl/osnet/dev/fbt/fbt.c Wed Mar 05 19:43:46 2014 +0000
+++ b/external/cddl/osnet/dev/fbt/fbt.c Wed Mar 05 20:14:15 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fbt.c,v 1.12 2013/03/03 18:18:13 christos Exp $        */
+/*     $NetBSD: fbt.c,v 1.13 2014/03/05 20:14:15 tron Exp $    */
 
 /*
  * CDDL HEADER START
@@ -703,7 +703,6 @@
 fbt_ctfoff_init(dtrace_modctl_t *mod, mod_ctf_t *mc)
 {
        const Elf_Sym *symp = mc->symtab;
-       const char *name;
        const ctf_header_t *hp = (const ctf_header_t *) mc->ctftab;
        const uint8_t *ctfdata = mc->ctftab + sizeof(ctf_header_t);
        int i;
@@ -758,11 +757,6 @@
                        continue;
                }
 
-               if (symp->st_name < mc->strcnt)
-                       name = mc->strtab + symp->st_name;
-               else
-                       name = "(?)";
-
                switch (ELF_ST_TYPE(symp->st_info)) {
                case STT_OBJECT:
                        if (objtoff >= hp->cth_funcoff ||
diff -r 2e6e61fedefd -r e07a461b0a20 external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Wed Mar 05 19:43:46 2014 +0000
+++ b/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c       Wed Mar 05 20:14:15 2014 +0000
@@ -16666,6 +16666,7 @@
        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;
 }