two easy smells

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index 660158a..da9801d 100644 (file)
--- 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";
 
                else if ("x86_64".equalsIgnoreCase(arch) || "AMD64".equalsIgnoreCase(arch))
                        arch = "amd64";
 

-               if (os.toLowerCase().startsWith("win")){
+               if (os.toLowerCase().startsWith("win")) {

                        os = "Windows";
                        os = "Windows";

-               } else if (os.contains("OS X"))
+               } else if (os.contains("OS X")) {

                        os = "Darwin";
                        os = "Darwin";

-
+               }

                os = os.replace(' ', '_');
                arch = arch.replace(' ', '_');
 
                os = os.replace(' ', '_');
                arch = arch.replace(' ', '_');
 

diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index df50495..753eda8 100644 (file)
--- 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 (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. */
     }
 
     /* Full blocks -> Full blocks; see if we can hold it in place. */