From: Tom Hughes <tom@compton.nu>
Date: Sat, 5 Jan 2008 00:01:20 +0000 (+0000)
Subject: Fix compiler warnings by using a variable to hide the null pointer
X-Git-Tag: svn/VALGRIND_3_4_0~1113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eab41712851dee104746373d574d74691645c44d;p=thirdparty%2Fvalgrind.git

Fix compiler warnings by using a variable to hide the null pointer
from the compiler.

Patch from Bart Van Assche <bart.vanassche@gmail.com>.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7317
---

diff --git a/memcheck/tests/execve.c b/memcheck/tests/execve.c
index 0e8222d439..83e058a2f3 100644
--- a/memcheck/tests/execve.c
+++ b/memcheck/tests/execve.c
@@ -2,10 +2,11 @@
 
 int main(void)
 {
+   char* null_filename = NULL;
    char* bad[2]  = { (char*)1, NULL };
    char* good[1] = {           NULL };
 
-   execve(NULL, bad, bad);
+   execve(null_filename, bad, bad);
    execve("/bin/true", good, good);
 
    return 0;
diff --git a/memcheck/tests/execve.stderr.exp b/memcheck/tests/execve.stderr.exp
index 9048cd7a39..b8a299f615 100644
--- a/memcheck/tests/execve.stderr.exp
+++ b/memcheck/tests/execve.stderr.exp
@@ -1,14 +1,14 @@
 Syscall param execve(filename) points to unaddressable byte(s)
    at 0x........: execve (in /...libc...)
-   by 0x........: main (execve.c:8)
+   by 0x........: main (execve.c:9)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Syscall param execve(argv[i]) points to unaddressable byte(s)
    at 0x........: execve (in /...libc...)
-   by 0x........: main (execve.c:8)
+   by 0x........: main (execve.c:9)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Syscall param execve(envp[i]) points to unaddressable byte(s)
    at 0x........: execve (in /...libc...)
-   by 0x........: main (execve.c:8)
+   by 0x........: main (execve.c:9)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
diff --git a/memcheck/tests/execve2.c b/memcheck/tests/execve2.c
index 07475d38c6..b3d44ecdc2 100644
--- a/memcheck/tests/execve2.c
+++ b/memcheck/tests/execve2.c
@@ -3,7 +3,9 @@
 
 int main ( int argc, char** argv, char** envp )
 {
-   execve(NULL,        NULL, NULL);
+   char* null_filename = NULL;
+
+   execve(null_filename,      NULL, NULL);
    execve("../../tests/true", NULL, envp);
    assert(0);  // shouldn't get here
 }
diff --git a/memcheck/tests/execve2.stderr.exp b/memcheck/tests/execve2.stderr.exp
index 9fd8ff09cb..087a1939ef 100644
--- a/memcheck/tests/execve2.stderr.exp
+++ b/memcheck/tests/execve2.stderr.exp
@@ -1,4 +1,4 @@
 Syscall param execve(filename) points to unaddressable byte(s)
    at 0x........: execve (in /...libc...)
-   by 0x........: main (execve2.c:6)
+   by 0x........: main (execve2.c:8)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd