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, 6 insertions, 6 deletions

diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c b/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c
index c0c68b5..f7b3034 100644
--- a/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c
+++ b/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c
@@ -47,7 +47,7 @@
 #include "memory.h"
 #include "traverse.h"
 
-char *curhdr;
+const char *curhdr;
 
 /*
  * The stabs generator will sometimes reference types before they've been
@@ -59,7 +59,7 @@ char *curhdr;
  */
 /*ARGSUSED2*/
 static int
-resolve_tou_node(tdesc_t *node, tdesc_t **nodep, void *private __unused)
+resolve_tou_node(tdesc_t *node, tdesc_t **nodep, void *private)
 {
 	tdesc_t *new;
 
@@ -79,7 +79,7 @@ resolve_tou_node(tdesc_t *node, tdesc_t **nodep, void *private __unused)
 
 /*ARGSUSED*/
 static int
-resolve_fwd_node(tdesc_t *node, tdesc_t **nodep, void *private __unused)
+resolve_fwd_node(tdesc_t *node, tdesc_t **nodep, void *private)
 {
 	tdesc_t *new = lookupname(node->t_name);
 
@@ -174,7 +174,7 @@ fnarg_free(iidesc_t *ii)
  * assembled under an iidesc list.
  */
 int
-stabs_read(tdata_t *td, Elf *elf, char *file)
+stabs_read(tdata_t *td, Elf *elf, const char *file)
 {
 	Elf_Scn *scn;
 	Elf_Data *data;
@@ -200,7 +200,7 @@ stabs_read(tdata_t *td, Elf *elf, char *file)
 
 	file_stack = stack_new(free);
 
-	stack_push(file_stack, file);
+	stack_push(file_stack, (void *)file);
 	curhdr = file;
 
 	debug(3, "Found stabs in %d, strings in %d\n", stabidx, stabstridx);
@@ -255,7 +255,7 @@ stabs_read(tdata_t *td, Elf *elf, char *file)
 
 		if (stab->n_type == N_BINCL) {
 			curhdr = xstrdup(str);
-			stack_push(file_stack, curhdr);
+			stack_push(file_stack, (void *)curhdr);
 			continue;
 		} else if (stab->n_type == N_SO) {
 			if (str[strlen(str) - 1] != '/') {