From owner-p4-projects@FreeBSD.ORG Thu Oct 18 04:59:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBA5A16A419; Thu, 18 Oct 2007 04:59:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85AD116A418 for ; Thu, 18 Oct 2007 04:59:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7163213C459 for ; Thu, 18 Oct 2007 04:59:12 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4xCkY004160 for ; Thu, 18 Oct 2007 04:59:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4xCCk004157 for perforce@freebsd.org; Thu, 18 Oct 2007 04:59:12 GMT (envelope-from jb@freebsd.org) Date: Thu, 18 Oct 2007 04:59:12 GMT Message-Id: <200710180459.l9I4xCCk004157@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 127658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Oct 2007 04:59:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=127658 Change 127658 by jb@jb_freebsd1 on 2007/10/18 04:58:59 Fix compiler warnings for WARNS=6. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#6 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/dump/dump.c#6 (text) ==== @@ -287,7 +287,7 @@ int symidx, len, i; char *name = NULL; - for (symidx = -1, i = 0; i < n; i++) { + for (symidx = -1, i = 0; i < (int) n; i++) { int nextsym; if (cd->cd_symdata == NULL || (nextsym = next_sym(cd, @@ -419,7 +419,7 @@ union { const void *ptr; - const ctf_array_t *ap; + ctf_array_t *ap; const ctf_member_t *mp; const ctf_lmember_t *lmp; const ctf_enum_t *ep; @@ -439,7 +439,7 @@ increment = sizeof (ctf_stype_t); size = tp->ctt_size; } - u.ptr = (caddr_t)tp + increment; + u.ptr = (const char *)tp + increment; switch (kind) { case CTF_K_INTEGER: @@ -527,13 +527,13 @@ } if (flags != F_STATS) { - (void) printf(" %s (%d bytes)\n", + (void) printf(" %s (%zd bytes)\n", ref_to_str(tp->ctt_name, hp, cd), size); if (size >= CTF_LSTRUCT_THRESH) { for (i = 0; i < n; i++, u.lmp++) { (void) printf( - "\t%s type=%u off=%llu\n", + "\t%s type=%u off=%lu\n", ref_to_str(u.lmp->ctlm_name, hp, cd), u.lmp->ctlm_type, CTF_LMEM_OFFSET(u.lmp)); @@ -785,7 +785,7 @@ } static Elf_Scn * -findelfscn(Elf *elf, GElf_Ehdr *ehdr, char *secname) +findelfscn(Elf *elf, GElf_Ehdr *ehdr, const char *secname) { GElf_Shdr shdr; Elf_Scn *scn; @@ -811,7 +811,7 @@ ctf_data_t cd; const ctf_preamble_t *pp; - ctf_header_t *hp; + ctf_header_t *hp = NULL; Elf *elf; GElf_Ehdr ehdr; @@ -871,7 +871,7 @@ if ((elf = elf_begin(fd, ELF_C_READ, NULL)) != NULL && gelf_getehdr(elf, &ehdr) != NULL) { - Elf_Data *dp; + Elf_Data *dp = NULL; Elf_Scn *ctfscn = findelfscn(elf, &ehdr, ".SUNW_ctf"); Elf_Scn *symscn; GElf_Shdr ctfshdr; @@ -1012,7 +1012,7 @@ if ((ufd = open(ufile, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0 || write(ufd, &h, sizeof (h)) != sizeof (h) || - write(ufd, cd.cd_ctfdata, cd.cd_ctflen) != cd.cd_ctflen) { + write(ufd, cd.cd_ctfdata, cd.cd_ctflen) != (int) cd.cd_ctflen) { warn("failed to write CTF data to '%s'", ufile); error |= E_ERROR; }