PERFORCE change 103959 for review

[John Birrell]

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

Change 103959 by jb at jb_freebsd2 on 2006/08/15 02:41:56

	More compiler warning avoidance.

Affected files ...

.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#4 (text) ====

@@ -54,7 +54,7 @@
 ctf_file_t *
 ctf_create(int *errp)
 {
-	static const ctf_header_t hdr = { { CTF_MAGIC, CTF_VERSION, 0 } };
+	static ctf_header_t hdr = { { CTF_MAGIC, CTF_VERSION, 0 }, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 	const ulong_t hashlen = 128;
 	ctf_dtdef_t **hash = ctf_alloc(hashlen * sizeof (ctf_dtdef_t *));
@@ -504,7 +504,7 @@
 int
 ctf_discard(ctf_file_t *fp)
 {
-	ctf_dtdef_t *dtd, *ntd;
+	ctf_dtdef_t *dtd, *ntd = NULL;
 
 	if (!(fp->ctf_flags & LCTF_RDWR))
 		return (ctf_set_errno(fp, ECTF_RDONLY));
@@ -513,7 +513,7 @@
 		return (0); /* no update required */
 
 	for (dtd = ctf_list_next(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
-		if (dtd->dtd_type <= fp->ctf_dtoldid)
+		if ((ulong_t) dtd->dtd_type <= fp->ctf_dtoldid)
 			continue; /* skip types that have been committed */
 
 		ntd = ctf_list_next(dtd);
@@ -1037,7 +1037,7 @@
 
 /*ARGSUSED*/
 static int
-membcmp(const char *name, ctf_id_t type, ulong_t offset, void *arg)
+membcmp(const char *name, __unused ctf_id_t type, ulong_t offset, void *arg)
 {
 	ctf_bundle_t *ctb = arg;
 	ctf_membinfo_t ctm;
@@ -1164,9 +1164,9 @@
 	 */
 	if (dst_type == CTF_ERR && name[0] != '\0') {
 		for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL &&
-		    dtd->dtd_type > dst_fp->ctf_dtoldid;
+		    (ulong_t) dtd->dtd_type > dst_fp->ctf_dtoldid;
 		    dtd = ctf_list_prev(dtd)) {
-			if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind &&
+			if ((uint_t) CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind &&
 			    dtd->dtd_name != NULL &&
 			    strcmp(dtd->dtd_name, name) == 0)
 				return (dtd->dtd_type);