Vendor import of the full userland contrib part of DTrace support from

OpenSolaris. This commit resets files to match the versions in the
OpenSolaris tree as of 2008/04/10.

The changes in this import from the previous import are the ones that
will subsequently re-applied to take files off the vendor branch. This
is unfortunately necessary because the Solaris developers won't allow
FreeBSD support #ifdefs in their source code because that creates
'dead code' (stuff that they never compile).

1 files changed, 0 insertions, 18 deletions

diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
index 263f70c..5005f59 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
@@ -25,7 +25,6 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include <string.h>
 #include <strings.h>
 #include <dt_impl.h>
 
@@ -139,29 +138,12 @@ dtrace_errno(dtrace_hdl_t *dtp)
 	return (dtp->dt_errno);
 }
 
-#if defined(sun)
 int
 dt_set_errno(dtrace_hdl_t *dtp, int err)
 {
 	dtp->dt_errno = err;
 	return (-1);
 }
-#else
-int
-_dt_set_errno(dtrace_hdl_t *dtp, int err, const char *errfile, int errline)
-{
-	dtp->dt_errno = err;
-	dtp->dt_errfile = errfile;
-	dtp->dt_errline = errline;
-	return (-1);
-}
-
-void dt_get_errloc(dtrace_hdl_t *dtp, const char **p_errfile, int *p_errline)
-{
-	*p_errfile = dtp->dt_errfile;
-	*p_errline = dtp->dt_errline;
-}
-#endif
 
 void
 dt_set_errmsg(dtrace_hdl_t *dtp, const char *errtag, const char *region,