Module Name: src
Committed By: roy
Date: Fri Feb 5 10:14:49 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/cmd/dtrace: dtrace.c
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Fix the actual issue rather than silencing the warning.
Thanks to gson@
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
diff -u src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.6 src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.7
--- src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c:1.6 Thu Feb 4 20:05:53 2016
+++ src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c Fri Feb 5 10:14:49 2016
@@ -819,7 +819,7 @@ fatal("DOODAD in function %s, file %s, l
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 @@ errhandler(const dtrace_errdata_t *data,
static int
drophandler(const dtrace_dropdata_t *data, void *arg)
{
- error(data->dtdda_msg);
+ error("%s", data->dtdda_msg);
return (DTRACE_HANDLE_OK);
}
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.8 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.9
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.8 Thu Feb 4 21:26:48 2016
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Fri Feb 5 10:14:49 2016
@@ -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 @@ CFLAGS+= -I${OSNETDIR}/sys \
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
