PERFORCE change 151877 for review

[Peter Wemm]

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

Change 151877 by peter at peter_cheese on 2008/10/24 20:27:54

	Fix some warnings

Affected files ...

.. //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#4 edit
.. //depot/projects/valgrind/coregrind/m_libcproc.c#5 edit
.. //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#4 edit
.. //depot/projects/valgrind/coregrind/m_signals.c#6 edit
.. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#6 edit

Differences ...

==== //depot/projects/valgrind/coregrind/m_aspacemgr/aspacemgr-freebsd.c#4 (text+ko) ====

@@ -371,7 +371,7 @@
       oid[0] = 0;	/* magic */
       oid[1] = 3;	/* undocumented */
       oidlen = sizeof(real_oid);
-      res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, strlen(name));
+      res = VG_(do_syscall6)(__NR___sysctl, (UWord)oid, 2, (UWord)real_oid, (UWord)&oidlen, (UWord)name, VG_(strlen)(name));
       oidlen /= sizeof(int);
       if (!res.isError && oidlen > 0) {
 	 len = sizeof(sc);
@@ -3045,11 +3045,10 @@
    Int    i, j, i_eol;
    Addr   start, endPlusOne, gapStart;
    UChar* filename;
-   UChar  rr, ww, xx, pp, ch, tmp;
+   UChar  rr, ww, xx, ch, tmp;
    UInt	  prot;
-   UWord  maj, min;
    ULong  foffset, dev, ino;
-   UInt   junk;
+   UWord  junkW;
    ULong  junk64;
 
    foffset = ino = 0; /* keep gcc-4.1.0 happy */
@@ -3087,7 +3086,7 @@
       if (j > 0) i += j; else goto syntaxerror;
       j = readchar(&procmap_buf[i], &ch);
       if (j == 1 && ch == ' ') i += j; else goto syntaxerror;
-      j = readhex(&procmap_buf[i], &junk);
+      j = readhex(&procmap_buf[i], &junkW);
       if (j > 0) i += j; else goto syntaxerror;
       j = readchar(&procmap_buf[i], &ch);
       if (j == 1 && ch == ' ') i += j; else goto syntaxerror;
@@ -3111,7 +3110,7 @@
       j = readchar(&procmap_buf[i], &ch);
       if (j == 1 && ch == ' ') i += j; else goto syntaxerror;
 
-      j = readhex(&procmap_buf[i], &junk);
+      j = readhex(&procmap_buf[i], &junkW);
       if (j > 0) i += j; else goto syntaxerror;
 
       j = readchar(&procmap_buf[i], &ch);

==== //depot/projects/valgrind/coregrind/m_libcproc.c#5 (text+ko) ====

@@ -666,7 +666,7 @@
    oid[0] = 0;		/* magic */
    oid[1] = 3;		/* undocumented */
    oidlen = sizeof(real_oid);
-   error = VG_(sysctl)(oid, 2, real_oid, &oidlen, (void *)name, strlen(name));
+   error = VG_(sysctl)(oid, 2, real_oid, &oidlen, (void *)name, VG_(strlen)(name));
    if (error < 0)
       return error;
    oidlen /= sizeof(int);

==== //depot/projects/valgrind/coregrind/m_sigframe/sigframe-x86-freebsd.c#4 (text+ko) ====

@@ -409,7 +409,7 @@
 static Bool extend ( ThreadState *tst, Addr addr, SizeT size )
 {
    ThreadId tid = tst->tid;
-   NSegment *stackseg = NULL;
+   const NSegment *stackseg = NULL;
 
    if (VG_(extend_stack)(addr, tst->client_stack_szB)) {
       stackseg = VG_(am_find_nsegment)(addr);
@@ -735,7 +735,7 @@
       size = restore_rt_sigframe(tst, (struct rt_sigframe *)uc, &sigNo);
    else
 #endif
-      size = restore_sigframe(tst, (struct sigframe *)uc, &sigNo);
+      size = restore_sigframe(tst, uc, &sigNo);
 
 /* QQQ probably not right. linux sigreturn is strange. */
    VG_TRACK( die_mem_stack_signal, esp - VG_STACK_REDZONE_SZB,

==== //depot/projects/valgrind/coregrind/m_signals.c#6 (text+ko) ====

@@ -1866,7 +1866,7 @@
 
    if (VG_(clo_trace_signals)) {
       VG_(message)(Vg_DebugMsg, "signal %d arrived ... si_code=%d, "
-                                "EIP=%#lx, eip=%#lx addr=%#lx",
+                                "EIP=%#lx, eip=%#x addr=%#lx",
                    sigNo, info->si_code, VG_(get_IP)(tid), 
 		   VG_UCONTEXT_INSTR_PTR(uc), (Addr)info->si_addr );
    }
@@ -1974,7 +1974,7 @@
 		   sigNo, signame(sigNo));
 
       VG_(message)(Vg_DebugMsg, 
-		   "si_code=%x;  Faulting address: %p;  sp: %#lx",
+		   "si_code=%x;  Faulting address: %p;  sp: %#x",
 		   info->si_code, info->VKI_SIGINFO_si_addr,
                    VG_UCONTEXT_STACK_PTR(uc));
 

==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-generic.c#6 (text+ko) ====

@@ -5162,7 +5162,7 @@
    }
 
    if (VG_(clo_trace_signals))
-      VG_(message)(Vg_DebugMsg, "kill: sending signal %d to pid %d",
+      VG_(message)(Vg_DebugMsg, "kill: sending signal %ld to pid %ld",
 		   ARG2, ARG1);
 
    /* If we're sending SIGKILL, check to see if the target is one of