From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 19 Jun 2018 07:23:51 +0000 (+0200)
Subject: two easy smells
X-Git-Tag: v3.20~69
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/982442189350b73c9dac4fe1a282b2c96e06e024

two easy smells
---

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 660158a75f..da9801dcdd 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -142,11 +142,11 @@ public final class NativeLib {
 		else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
 			arch = "amd64";
 
-		if (os.toLowerCase().startsWith("win")){
+		if (os.toLowerCase().startsWith("win")) {
 			os = "Windows";
-		} else if (os.contains("OS X"))
+		} else if (os.contains("OS X")) {
 			os = "Darwin";
-
+		}
 		os = os.replace(' ', '_');
 		arch = arch.replace(' ', '_');
 
diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index df50495de4..753eda8cd5 100644
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -69,11 +69,9 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
     if (size <= BLOCKSIZE / 2) { // Full block -> Fragment; no need to optimize for time
 
       result = mmalloc(mdp, size);
-      if (result != NULL) { // useless (mmalloc never returns NULL), but harmless
-        memcpy(result, ptr, requested_size);
-        mfree(mdp, ptr);
-        return (result);
-      }
+      memcpy(result, ptr, requested_size);
+      mfree(mdp, ptr);
+      return (result);
     }
 
     /* Full blocks -> Full blocks; see if we can hold it in place. */