[src/trunk]: src/external/cddl/osnet Fix the actual issue rather than silenci...

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

details:   https://anonhg.NetBSD.org/src/rev/1009b4933435
branches:  trunk
changeset: 813600:1009b4933435
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Feb 05 10:14:49 2016 +0000

description:
Fix the actual issue rather than silencing the warning.

Thanks to gson@

diffstat:

 external/cddl/osnet/dist/cmd/dtrace/dtrace.c |  4 ++--
 external/cddl/osnet/usr.sbin/dtrace/Makefile |  4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r d3b38d1c8534 -r 1009b4933435 external/cddl/osnet/dist/cmd/dtrace/dtrace.c
--- a/external/cddl/osnet/dist/cmd/dtrace/dtrace.c      Fri Feb 05 04:18:55 2016 +0000
+++ b/external/cddl/osnet/dist/cmd/dtrace/dtrace.c      Fri Feb 05 10:14:49 2016 +0000
@@ -819,7 +819,7 @@
 static int
 errhandler(const dtrace_errdata_t *data, void *arg)
 {
-       error(data->dteda_msg);
+       error("%s", data->dteda_msg);
        return (DTRACE_HANDLE_OK);
 }
 
@@ -827,7 +827,7 @@
 static int
 drophandler(const dtrace_dropdata_t *data, void *arg)
 {
-       error(data->dtdda_msg);
+       error("%s", data->dtdda_msg);
        return (DTRACE_HANDLE_OK);
 }
 
diff -r d3b38d1c8534 -r 1009b4933435 external/cddl/osnet/usr.sbin/dtrace/Makefile
--- a/external/cddl/osnet/usr.sbin/dtrace/Makefile      Fri Feb 05 04:18:55 2016 +0000
+++ b/external/cddl/osnet/usr.sbin/dtrace/Makefile      Fri Feb 05 10:14:49 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2016/02/04 21:26:48 roy Exp $
+#      $NetBSD: Makefile,v 1.9 2016/02/05 10:14:49 roy Exp $
 
 # $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -30,8 +30,6 @@
 
 COPTS.dtrace.c += -Wno-stack-protector
 COPTS.dtrace.c += -Wno-format-extra-args
-COPTS.dtrace.c += -Wno-format-nonliteral
-COPTS.dtrace.c += -Wno-format-security
 
 LDFLAGS+=      -pthread