commit 97b89f7a284a15590beb9e8dfc932f5aeffd68d5
author florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Sep 02 11:58:10 2014 +0000
committer florian <florian@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Sep 02 11:58:10 2014 +0000
tree 86b9e434f2832bb372a6048230c16758c8c316f9
parent fdae2316e234e31b87c876376f60d927da7a7ccf

Remove some unneeded checks. These were spotted by the Coverity checker.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14430 a5019735-40e9-0310-863c-91ae7b9d1cf9

auxprogs/valgrind-di-server.c

diff --git a/auxprogs/valgrind-di-server.c b/auxprogs/valgrind-di-server.c
index 40b59d7..85c1370 100644
--- a/auxprogs/valgrind-di-server.c
+++ b/auxprogs/valgrind-di-server.c
@@ -884,8 +884,8 @@
 //printf("SERVER: send %c%c%c%c\n", res->data[0], res->data[1], res->data[2], res->data[3]); fflush(stdout);
 
    /* So, success. */
-   if (req) free_Frame(req);
-   if (res) free_Frame(res);
+   free_Frame(req);
+   free_Frame(res);
    return False;  /* "connection still in use" */
 
    // Is there any difference between these?

coregrind/m_debuginfo/image.c

diff --git a/coregrind/m_debuginfo/image.c b/coregrind/m_debuginfo/image.c
index 2be6fd3..02a367d 100644
--- a/coregrind/m_debuginfo/image.c
+++ b/coregrind/m_debuginfo/image.c
@@ -718,7 +718,7 @@
    return img;
 
   fail:
-   if (req) free_Frame(req);
+   free_Frame(req);
    if (res) {
       UChar* reason = NULL;
       if (parse_Frame_asciiz(res, "FAIL", &reason)) {
@@ -1006,8 +1006,8 @@
       ULong crc32 = 0;
       if (!parse_Frame_le64(res, "CROK", &crc32)) goto remote_crc_fail;
       if ((crc32 & ~0xFFFFFFFFULL) != 0) goto remote_crc_fail;
-      if (req) free_Frame(req);
-      if (res) free_Frame(res);
+      free_Frame(req);
+      free_Frame(res);
       return (UInt)crc32;
      remote_crc_fail: