X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2444896cc5969f2b9150b035f9ea0744e74789d..5a00610e05eab122e23f56b589d5bb240e6ceda7:/src/surf/storage_n11.cpp

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 4ee6967951..39a791712d 100644
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -10,7 +10,7 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
 
 static int storage_selective_update = 0;
-static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_swag_t storage_running_action_set_that_does_not_need_being_checked = nullptr;
 
 /*************
  * CallBacks *
@@ -54,7 +54,7 @@ void storage_register_callbacks()
  * Model *
  *********/
 
-void surf_storage_model_init_default(void)
+void surf_storage_model_init_default()
 {
   surf_storage_model = new simgrid::surf::StorageN11Model();
   xbt_dynar_push(all_existing_models, &surf_storage_model);
@@ -64,7 +64,7 @@ namespace simgrid {
 namespace surf {
 
 StorageN11Model::StorageN11Model() : StorageModel() {
-  Action *action = NULL;
+  Action *action = nullptr;
 
   XBT_DEBUG("surf_storage_model_init_internal");
 
@@ -77,7 +77,7 @@ StorageN11Model::StorageN11Model() : StorageModel() {
 
 StorageN11Model::~StorageN11Model(){
   xbt_swag_free(storage_running_action_set_that_does_not_need_being_checked);
-  storage_running_action_set_that_does_not_need_being_checked = NULL;
+  storage_running_action_set_that_does_not_need_being_checked = nullptr;
 }
 
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
@@ -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);
 
@@ -112,7 +112,7 @@ Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
       Bread);
 
   if(!p_storageList)
-    p_storageList = xbt_dynar_new(sizeof(char *),NULL);
+    p_storageList = xbt_dynar_new(sizeof(char *),nullptr);
   xbt_dynar_push(p_storageList, &storage);
 
   return storage;
@@ -149,7 +149,7 @@ double StorageN11Model::next_occuring_event(double /*now*/)
 
 void StorageN11Model::updateActionsState(double /*now*/, double delta)
 {
-  StorageAction *action = NULL;
+  StorageAction *action = nullptr;
 
   ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
@@ -162,7 +162,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       // Update the disk usage
       // Update the file size
       // For each action of type write
-      volatile double current_progress =
+      double current_progress =
           delta * lmm_variable_getvalue(action->getVariable());
       long int incr = current_progress;
 
@@ -188,7 +188,7 @@ void StorageN11Model::updateActionsState(double /*now*/, double delta)
       sg_size_t *psize = xbt_new(sg_size_t,1);
       *psize = action->p_file->size;
       xbt_dict_t content_dict = action->p_storage->p_content;
-      xbt_dict_set(content_dict, action->p_file->name, psize, NULL);
+      xbt_dict_set(content_dict, action->p_file->name, psize, nullptr);
     }
 
     action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
@@ -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);
@@ -243,7 +243,7 @@ StorageAction *StorageN11::open(const char* mount, const char* path)
     psize = xbt_new(sg_size_t,1);
     size = 0;
     *psize = size;
-    xbt_dict_set(p_content, path, psize, NULL);
+    xbt_dict_set(p_content, path, psize, nullptr);
     XBT_DEBUG("File '%s' was not found, file created.",path);
   }
   surf_file_t file = xbt_new0(s_surf_file_t,1);