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, 2 insertions, 3 deletions

diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/input.c b/cddl/contrib/opensolaris/tools/ctf/cvt/input.c
index 67ebde7..d901e53 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/input.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/input.c
@@ -71,7 +71,6 @@ built_source_types(Elf *elf, char const *file)
 			/* ignore */
 			break;
 		case 's':
-		case 'S':
 			types |= SOURCE_S;
 			break;
 		default:
@@ -88,7 +87,7 @@ read_file(Elf *elf, char *file, char *label, read_cb_f *func, void *arg,
     int require_ctf)
 {
 	Elf_Scn *ctfscn;
-	Elf_Data *ctfdata = NULL;
+	Elf_Data *ctfdata;
 	symit_data_t *si = NULL;
 	int ctfscnidx;
 	tdata_t *td;
@@ -221,7 +220,7 @@ read_ctf_common(char *file, char *label, read_cb_f *func, void *arg,
 
 /*ARGSUSED*/
 int
-read_ctf_save_cb(tdata_t *td, char *name __unused, void *retp)
+read_ctf_save_cb(tdata_t *td, char *name, void *retp)
 {
 	tdata_t **tdp = retp;