From 2c7c27ceb7de4182a8e49520e76dce97ec4f3569 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 26 Mar 2016 11:59:14 +0100
Subject: [PATCH] small cleanups here and there

---
 src/surf/network_constant.cpp | 1 -
 src/surf/network_ns3.cpp      | 6 +++---
 src/surf/network_ns3.hpp      | 4 ++--
 src/surf/surf_interface.cpp   | 8 ++------
 src/surf/surf_interface.hpp   | 2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 8d88832c3a..960e513f25 100644
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -99,7 +99,6 @@ namespace simgrid {
         stateSet_ = getModel()->getDoneActionSet();
         stateSet_->push_back(*this);
       }
-      variable_ = NULL;
     };
   }
 }
diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 0375f647bc..efd328bed5 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -299,7 +299,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta)
 
       std::vector<Link*> *route = new std::vector<Link*>();
 
-      routing_platf->getRouteAndLatency (action->srcElm_, action->dstElm_, route, NULL);
+      routing_platf->getRouteAndLatency (action->src_, action->dst_, route, NULL);
       for (auto link : *route)
         TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
       delete route;
@@ -364,8 +364,8 @@ NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetC
 {
   XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
 
-  srcElm_ = src;
-  dstElm_ = dst;
+  src_ = src;
+  dst_ = dst;
   ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
 
   Link::onCommunicate(this, src, dst);
diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp
index a8f1f198ed..a92c17d6d4 100644
--- a/src/surf/network_ns3.hpp
+++ b/src/surf/network_ns3.hpp
@@ -56,8 +56,8 @@ public:
 
 //private:
   double lastSent_ = 0;
-  NetCard *srcElm_;
-  NetCard *dstElm_;
+  NetCard *src_;
+  NetCard *dst_;
 };
 
 }
diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 05b3c8bb13..a6a48253f6 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -883,12 +883,8 @@ void Action::updateRemainingLazy(double now)
   }
   else
   {
-    xbt_assert(stateSet_ == getModel()->getRunningActionSet(),
-        "You're updating an action that is not running.");
-
-      /* bogus priority, skip it */
-    xbt_assert(priority_ > 0,
-        "You're updating an action that seems suspended.");
+    xbt_assert(stateSet_ == getModel()->getRunningActionSet(), "You're updating an action that is not running.");
+    xbt_assert(priority_ > 0, "You're updating an action that seems suspended.");
   }
 
   delta = now - lastUpdate_;
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 7b13c6cd55..b5ada0e884 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -255,7 +255,7 @@ public:
   void gapRemove();
 
 protected:
-  lmm_variable_t variable_;
+  lmm_variable_t variable_ = nullptr;
   double lastValue_ = 0;
   double lastUpdate_ = 0;
   int suspended_ = 0;
-- 
2.20.1