From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 2 Oct 2013 15:37:03 +0000 (+0000)
Subject: Silence clang warnings for the none and exp-sgcheck tools.
X-Git-Tag: svn/VALGRIND_3_9_0~86
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9de72049d5250dca8ebaff0004c1a1a4c40a6198;p=thirdparty%2Fvalgrind.git

Silence clang warnings for the none and exp-sgcheck tools.


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

diff --git a/exp-sgcheck/tests/Makefile.am b/exp-sgcheck/tests/Makefile.am
index 30dab91a2f..47cbb2d843 100644
--- a/exp-sgcheck/tests/Makefile.am
+++ b/exp-sgcheck/tests/Makefile.am
@@ -39,6 +39,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 # least some optimisation.
 hackedbz2_CFLAGS	= $(AM_CFLAGS) -O -Wno-inline
 
+globalerr_CFLAGS        = $(AM_CFLAGS) @FLAG_W_NO_UNINITIALIZED@
 # C ones
 #pth_create_LDADD	= -lpthread
 
diff --git a/none/tests/fdleak_cmsg.c b/none/tests/fdleak_cmsg.c
index 32387b27a1..6718fc265e 100644
--- a/none/tests/fdleak_cmsg.c
+++ b/none/tests/fdleak_cmsg.c
@@ -47,8 +47,8 @@ void server (void)
    sprintf(addr.sun_path, "%s", sock);
 
    unlink(sock);
-   DO( bind(s, (struct sockaddr *)&addr, sizeof(addr)) );
-   DO( listen(s, 5) );
+   (void) DO( bind(s, (struct sockaddr *)&addr, sizeof(addr)) );
+   (void) DO( listen(s, 5) );
 
    {
       int x;
@@ -77,7 +77,7 @@ void server (void)
       msg.msg_iov = iov;
       msg.msg_iovlen = 1;
 
-      DO( sendmsg(x, &msg, 0) );
+      (void) DO( sendmsg(x, &msg, 0) );
    }
 }
 
@@ -164,8 +164,8 @@ int main (int argc, char **argv)
 
    wait(&status);
 
-   DO( unlink(filea) );
-   DO( unlink(fileb) );
-   DO( unlink(sock) );
+   (void) DO( unlink(filea) );
+   (void) DO( unlink(fileb) );
+   (void) DO( unlink(sock) );
    return 0;
 }
diff --git a/none/tests/fdleak_creat.c b/none/tests/fdleak_creat.c
index c4debc4a68..994692adaf 100644
--- a/none/tests/fdleak_creat.c
+++ b/none/tests/fdleak_creat.c
@@ -10,7 +10,7 @@ int main (int argc, char **argv)
    CLOSE_INHERITED_FDS;
 
    sprintf(filename, "/tmp/file.%d", getpid());
-   DO( creat(filename, 0) );
-   DO( unlink(filename) );
+   (void) DO( creat(filename, 0) );
+   (void) DO( unlink(filename) );
    return 0;
 }
diff --git a/none/tests/fdleak_dup.c b/none/tests/fdleak_dup.c
index 9136376176..f526121e2e 100644
--- a/none/tests/fdleak_dup.c
+++ b/none/tests/fdleak_dup.c
@@ -9,7 +9,7 @@ int main (int argc, char **argv)
    CLOSE_INHERITED_FDS;
 
    s = DO( open("/dev/null", O_RDONLY) );
-   DO( dup(s) );
+   (void) DO( dup(s) );
 
    return 0;
 }
diff --git a/none/tests/fdleak_dup2.c b/none/tests/fdleak_dup2.c
index e78b48e1f2..96a7271c69 100644
--- a/none/tests/fdleak_dup2.c
+++ b/none/tests/fdleak_dup2.c
@@ -12,8 +12,8 @@ int main (int argc, char **argv)
    s1 = DO( open("/dev/null", O_RDONLY) );
    s2 = DO( open("/dev/null", O_RDONLY) );
 
-   DO( dup2(s1, 20) );  // dup s1 as fd 20
-   DO( dup2(s1, s2) );  // dup s1 as fd s2, which closes existing s2 fd
+   (void) DO( dup2(s1, 20) );  // dup s1 as fd 20
+   (void) DO( dup2(s1, s2) );  // dup s1 as fd s2, which closes existing s2 fd
 
    return 0;
 }
diff --git a/none/tests/fdleak_fcntl.c b/none/tests/fdleak_fcntl.c
index 3d776b47a5..c57a2608b6 100644
--- a/none/tests/fdleak_fcntl.c
+++ b/none/tests/fdleak_fcntl.c
@@ -10,7 +10,7 @@ int main (int argc, char **argv)
    CLOSE_INHERITED_FDS;
 
    s1 = DO( open("/dev/null", O_RDONLY) );
-   DO( fcntl(s1, F_DUPFD, s1) );
+   (void) DO( fcntl(s1, F_DUPFD, s1) );
 
    return 0;
 }
diff --git a/none/tests/fdleak_ipv4.c b/none/tests/fdleak_ipv4.c
index d3ef75d8ab..89f7acb9c8 100644
--- a/none/tests/fdleak_ipv4.c
+++ b/none/tests/fdleak_ipv4.c
@@ -20,20 +20,20 @@ void server ()
    
    s = DO( socket(PF_INET, SOCK_STREAM, 0) );
 
-   DO( setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int)) );
+   (void) DO( setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(int)) );
    memset(&addr, 0, sizeof(addr));
    addr.sin_family = AF_INET;
    addr.sin_addr.s_addr = inet_addr("127.0.0.1");
    addr.sin_port = htons(12321);
 
-   DO( bind(s, (struct sockaddr *)&addr, sizeof(addr)) );
+   (void) DO( bind(s, (struct sockaddr *)&addr, sizeof(addr)) );
 
-   DO( listen(s, 5) );
+   (void) DO( listen(s, 5) );
 
    memset(&baddr, 0, sizeof(baddr));
    x = DO( accept(s, (struct sockaddr *)&baddr, &baddrsize) );
 
-   DO( write(x, "hello", 6) );
+   (void) DO( write(x, "hello", 6) );
 }
 
 void client ()
@@ -53,7 +53,7 @@ void client ()
      if (ret == -1) {
        // If the connect() failed, we close the socket and reopen it before
        // trying again.  This isn't necessary on Linux, but it is on Darwin.
-       DO( close(s) );
+       (void) DO( close(s) );
        sleep(1);
      }
    } while (count < 10 && ret == -1);
@@ -63,7 +63,7 @@ void client ()
       exit(1);
    }
 
-   DO( read(s, buf, sizeof(buf)) );
+   (void) DO( read(s, buf, sizeof(buf)) );
 
    printf("%s\n", buf);
 }
diff --git a/none/tests/fdleak_open.c b/none/tests/fdleak_open.c
index d477b3be7a..cf6a35e97c 100644
--- a/none/tests/fdleak_open.c
+++ b/none/tests/fdleak_open.c
@@ -6,7 +6,7 @@ int main (int argc, char **argv)
 {
    CLOSE_INHERITED_FDS;
 
-   DO( open("/dev/null", O_RDONLY) );
+   (void) DO( open("/dev/null", O_RDONLY) );
 
    return 0;
 }
diff --git a/none/tests/fdleak_pipe.c b/none/tests/fdleak_pipe.c
index bff4588d8f..82ff24e885 100644
--- a/none/tests/fdleak_pipe.c
+++ b/none/tests/fdleak_pipe.c
@@ -7,7 +7,7 @@ int main (int argc, char **argv)
 
    CLOSE_INHERITED_FDS;
 
-   DO( pipe(fds) );
+   (void) DO( pipe(fds) );
 
    return 0;
 }
diff --git a/none/tests/fdleak_socketpair.c b/none/tests/fdleak_socketpair.c
index 45b75cce92..19c0775039 100644
--- a/none/tests/fdleak_socketpair.c
+++ b/none/tests/fdleak_socketpair.c
@@ -9,7 +9,7 @@ int main (int argc, char **argv)
 
    CLOSE_INHERITED_FDS;
 
-   DO( socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, fds) );
+   (void) DO( socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, fds) );
 
    return 0;
 }