From: Julian Seward <jseward@acm.org>
Date: Wed, 2 May 2007 10:43:25 +0000 (+0000)
Subject: Merge r6722 (Avoid compilation warnings with gcc-4.2.)
X-Git-Tag: svn/VALGRIND_3_2_3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64c4c7940663327c921a7c17c2ca359b5cc5868a;p=thirdparty%2Fvalgrind.git

Merge r6722 (Avoid compilation warnings with gcc-4.2.)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6725
---

diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
index 7d5f0c66e9..4137b563fb 100644
--- a/coregrind/m_debuginfo/readelf.c
+++ b/coregrind/m_debuginfo/readelf.c
@@ -242,7 +242,7 @@ Bool get_elf_symbol_info (
       return False;
 
    /* Ignore if nameless, or zero-sized. */
-   if (sym->st_name == (ElfXX_Word)NULL
+   if (sym->st_name == (ElfXX_Word)0
        || /* VG_(strlen)(sym_name) == 0 */
           /* equivalent but cheaper ... */
           sym_name[0] == 0
diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 093f2ae8c5..391760242e 100644
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -707,7 +707,7 @@ static void handle_tt_miss ( ThreadId tid )
 
 static void handle_syscall(ThreadId tid)
 {
-   ThreadState *tst = VG_(get_ThreadState)(tid);
+   ThreadState * volatile tst = VG_(get_ThreadState)(tid);
    Bool jumped; 
 
    /* Syscall may or may not block; either way, it will be
diff --git a/coregrind/m_ume.c b/coregrind/m_ume.c
index 7372df558b..837a3899ce 100644
--- a/coregrind/m_ume.c
+++ b/coregrind/m_ume.c
@@ -823,7 +823,8 @@ Int VG_(do_exec)(const HChar* exe_name, ExeInfo* info)
    ret = do_exec_inner(exe_name, info);
 
    if (0 != ret) {
-      ret = do_exec_shell_followup(ret, (Char*)exe_name, info);
+      Char* exe_name_casted = (Char*)exe_name;
+      ret = do_exec_shell_followup(ret, exe_name_casted, info);
    }
    return ret;
 }