PERFORCE change 132847 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=132847

Change 132847 by jb at jb_freebsd1 on 2008/01/09 04:23:24

	Return types are a wonderful thing. Provided you actually code them. Oops.
	
	A few debug changes.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#13 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/dwarf.c#13 (text) ====

@@ -357,8 +357,9 @@
 	*valp = 0;
 	if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DWARF_E_NONE) {
 		if (req) 
-			terminate("die %llu: failed to get unsigned: %s\n",
+			terminate("die %llu: failed to get signed: %s\n",
 			    die_off(dw, die), dwarf_errmsg(&dw->dw_err));
+		return (0);
 	}
 
 	return (1);
@@ -373,6 +374,7 @@
 		if (req) 
 			terminate("die %llu: failed to get unsigned: %s\n",
 			    die_off(dw, die), dwarf_errmsg(&dw->dw_err));
+		return (0);
 	}
 
 	return (1);
@@ -387,6 +389,7 @@
 		if (req) 
 			terminate("die %llu: failed to get flag: %s\n",
 			    die_off(dw, die), dwarf_errmsg(&dw->dw_err));
+		return (0);
 	}
 
 	return (1);
@@ -404,6 +407,7 @@
 			    die_off(dw, die), dwarf_errmsg(&dw->dw_err));
 		else
 			*strp = NULL;
+		return (0);
 	} else
 		*strp = xstrdup(str);
 
@@ -658,7 +662,7 @@
 	Dwarf_Unsigned uval;
 	Dwarf_Die dim;
 
-	debug(3, "die %llu: creating array\n", off);
+	debug(3, "die %llu <%llx>: creating array\n", off, off);
 
 	if ((dim = die_child(dw, arr)) == NULL ||
 	    die_tag(dw, dim) != DW_TAG_subrange_type)
@@ -689,7 +693,7 @@
 		tdp->t_flags |= flags;
 	}
 
-	debug(3, "die %llu: array nelems %u size %u\n", off,
+	debug(3, "die %llu <%llx>: array nelems %u size %u\n", off, off,
 	    tdp->t_ardef->ad_nelems, tdp->t_size);
 }
 
@@ -1082,10 +1086,11 @@
 
 	for (ml = tdp->t_members; ml != NULL; ml = ml->ml_next) {
 		if (ml->ml_size == 0) {
-			fprintf(stderr, "%s %d: failed to size member \"%s\" "
-			    "of type %s (%d)\n", typename, tdp->t_id,
+			fprintf(stderr, "%s %d <%x>: failed to size member \"%s\" "
+			    "of type %s (%d <%x>)\n", typename, tdp->t_id,
+			    tdp->t_id,
 			    ml->ml_name, tdesc_name(ml->ml_type),
-			    ml->ml_type->t_id);
+			    ml->ml_type->t_id, ml->ml_type->t_id);
 		}
 	}