From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 26 Mar 2016 11:06:38 +0000 (+0100)
Subject: let lmm_system_free(nullptr) be a noop
X-Git-Tag: v3_13~276
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/219810d5f28a3f177c7d9341b0fd227cbf651082

let lmm_system_free(nullptr) be a noop
---

diff --git a/src/surf/maxmin.cpp b/src/surf/maxmin.cpp
index 978745febe..e40a1ab08a 100644
--- a/src/surf/maxmin.cpp
+++ b/src/surf/maxmin.cpp
@@ -115,15 +115,16 @@ lmm_system_t lmm_system_new(int selective_update)
 
 void lmm_system_free(lmm_system_t sys)
 {
-  lmm_variable_t var = NULL;
-  lmm_constraint_t cnst = NULL;
+  lmm_variable_t var = nullptr;
+  lmm_constraint_t cnst = nullptr;
+
+  if (!sys)
+    return;
 
-  
   while ((var = (lmm_variable_t) extract_variable(sys))) {
     XBT_WARN("Variable %d still in system when freing it: this may be a bug", var->id_int);
     lmm_var_free(sys, var);
   }
-
   while ((cnst = (lmm_constraint_t) extract_constraint(sys)))
     lmm_cnst_free(sys, cnst);
 
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 8362e85704..a46e10b573 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -64,8 +64,7 @@ namespace simgrid {
 
       /** @brief Destructor */
       ~NetworkModel() {
-        if (maxminSystem_)
-          lmm_system_free(maxminSystem_);
+        lmm_system_free(maxminSystem_);
         xbt_heap_free(actionHeap_);
         delete modifiedSet_;
       }
diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index cf639a3db7..c674ff92bc 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -44,9 +44,7 @@ StorageModel::StorageModel()
 
 StorageModel::~StorageModel(){
   lmm_system_free(maxminSystem_);
-
   surf_storage_model = NULL;
-
   xbt_dynar_free(&p_storageList);
 }