From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Wed, 28 Jul 2004 16:03:29 +0000 (+0000)
Subject: Merge equivalent if statements.
X-Git-Tag: svn/VALGRIND_2_2_0~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc7eebda2e1f9fd667bdf1a9ec025df879611a7;p=thirdparty%2Fvalgrind.git

Merge equivalent if statements.


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

diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index f8f7322acc..860e8c9e85 100644
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -286,9 +286,7 @@ void* VG_(mmap)( void* start, UInt length,
       } else {
          vg_assert(VG_(valgrind_base) <= res && res+length < VG_(valgrind_end));
       }
-   }
 
-   if (!VG_(is_kerror)(res)) {
       sf_flags |= SF_MMAP;
       if (  flags & VKI_MAP_FIXED)      sf_flags |= SF_FIXED;
       if (  flags & VKI_MAP_SHARED)     sf_flags |= SF_SHARED;