From: Julian Seward <jseward@acm.org>
Date: Wed, 15 Mar 2006 12:13:30 +0000 (+0000)
Subject: Merge r5765 (A couple of initialisations to keep gcc-4.1.0 happy.)
X-Git-Tag: svn/VALGRIND_3_1_1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c191f994184b08df59de19fd7d6d2fa50104e14;p=thirdparty%2Fvalgrind.git

Merge r5765 (A couple of initialisations to keep gcc-4.1.0 happy.)



git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_1_BRANCH@5766
---

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 693a784a5e..a704d550c7 100644
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -3228,6 +3228,8 @@ static void parse_procselfmaps (
    UWord  maj, min, dev;
    ULong  foffset;
 
+   foffset = ino = 0; /* keep gcc-4.1.0 happy */
+
    read_procselfmaps_into_buf();
 
    aspacem_assert('\0' != procmap_buf[0] && 0 != buf_n_tot);
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 8f4b4b7c75..ebc057a23f 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1904,7 +1904,7 @@ Int main(Int argc, HChar **argv, HChar **envp)
    Addr    initial_client_SP = 0;
    Addr    clstack_top       = 0;
    SizeT   clstack_max_size  = 0;
-   UInt*   client_auxv;
+   UInt*   client_auxv       = NULL;
    Int     loglevel, i;
    Bool    logging_to_fd;
    struct vki_rlimit zero = { 0, 0 };