From 411f026243d789a2b8b6a0cbfff05c0857ebee77 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Thu, 10 Nov 2005 15:03:26 +0000
Subject: [PATCH] Avoid compiler warnings.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5071
---
 coregrind/m_stacks.c         | 10 ++++++----
 none/tests/x86/faultstatus.c |  6 +-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/coregrind/m_stacks.c b/coregrind/m_stacks.c
index b33326e40..fbd925490 100644
--- a/coregrind/m_stacks.c
+++ b/coregrind/m_stacks.c
@@ -137,7 +137,8 @@ UWord VG_(register_stack)(Addr start, Addr end)
       current_stack = i;
    }
 
-   VG_(debugLog)(2, "stacks", "register %p-%p as stack %d\n", start, end, i->id);
+   VG_(debugLog)(2, "stacks", "register %p-%p as stack %lu\n",
+                    (void*)start, (void*)end, i->id);
 
    return i->id;
 }
@@ -151,7 +152,7 @@ void VG_(deregister_stack)(UWord id)
    Stack *i = stacks;
    Stack *prev = NULL;
 
-   VG_(debugLog)(2, "stacks", "deregister stack %d\n", id);
+   VG_(debugLog)(2, "stacks", "deregister stack %lu\n", id);
 
    if (current_stack->id == id) {
       current_stack = NULL;
@@ -183,8 +184,9 @@ void VG_(change_stack)(UWord id, Addr start, Addr end)
 
    while (i) {
       if (i->id == id) {
-         VG_(debugLog)(2, "stacks", "change stack %d from %p-%p to %p-%p\n",
-                       id, i->start, i->end, start, end);
+         VG_(debugLog)(2, "stacks", "change stack %lu from %p-%p to %p-%p\n",
+                       id, (void*)i->start, (void*)i->end,
+                           (void*)start,    (void*)end);
          i->start = start;
          i->end = end;
          return;
diff --git a/none/tests/x86/faultstatus.c b/none/tests/x86/faultstatus.c
index 5d39753f9..a39289ba7 100644
--- a/none/tests/x86/faultstatus.c
+++ b/none/tests/x86/faultstatus.c
@@ -18,7 +18,7 @@ struct test {
 
 static const struct test *cur_test;
 
-static int zero();
+
 
 static jmp_buf escape;
 
@@ -158,7 +158,3 @@ int main()
 	return 0;
 }
 
-static int zero()
-{
-	return 0;
-}