X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6050383ef0dc59e1ca54d02bcf6bccb993593add..fd9d52c0c7a9c96221fff2013cdeef05b6e979e2:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 81308c10d7..3b270eb2b7 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -69,7 +69,7 @@ StorageN11Model::StorageN11Model() : StorageModel() {
   XBT_DEBUG("surf_storage_model_init_internal");
 
   storage_running_action_set_that_does_not_need_being_checked =
-      xbt_swag_new(xbt_swag_offset(*action, p_stateHookup));
+      xbt_swag_new(xbt_swag_offset(*action, stateHookup_));
   if (!maxminSystem_) {
     maxminSystem_ = lmm_system_new(storage_selective_update);
   }
@@ -101,7 +101,7 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
 
   Storage *storage = new StorageN11(this, id, properties, maxminSystem_,
       Bread, Bwrite, Bconnection, type_id, (char *)content_name,
-      xbt_strdup(content_type), storage_type->size, (char *) attach);
+      content_type, storage_type->size, (char *) attach);
   storageCreatedCallbacks(storage);
   xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
 
@@ -224,7 +224,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
 StorageN11::StorageN11(StorageModel *model, const char* name,
     xbt_dict_t properties, lmm_system_t maxminSystem, double bread,
     double bwrite, double bconnection, const char* type_id, char *content_name,
-    char *content_type, sg_size_t size, char *attach)
+    const char *content_type, sg_size_t size, char *attach)
 : Storage(model, name, properties,
     maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) {
   XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
@@ -350,10 +350,10 @@ StorageN11Action::StorageN11Action(Model *model, double cost, bool failed, Stora
 
 int StorageN11Action::unref()
 {
-  m_refcount--;
-  if (!m_refcount) {
+  refcount_--;
+  if (!refcount_) {
     if (action_hook.is_linked())
-      p_stateSet->erase(p_stateSet->iterator_to(*this));
+      stateSet_->erase(stateSet_->iterator_to(*this));
     if (getVariable())
       lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
     xbt_free(getCategory());
@@ -372,9 +372,9 @@ void StorageN11Action::cancel()
 void StorageN11Action::suspend()
 {
   XBT_IN("(%p)", this);
-  if (m_suspended != 2) {
+  if (suspended_ != 2) {
     lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
-    m_suspended = 1;
+    suspended_ = 1;
   }
   XBT_OUT();
 }
@@ -386,7 +386,7 @@ void StorageN11Action::resume()
 
 bool StorageN11Action::isSuspended()
 {
-  return m_suspended == 1;
+  return suspended_ == 1;
 }
 
 void StorageN11Action::setMaxDuration(double /*duration*/)