X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51dcb8e712855f3cb16800ddea745ef6fc8d79e9..41d5f3c8a30bf77b309143b174ea5a616b24c5c2:/src/surf/storage.c

diff --git a/src/surf/storage.c b/src/surf/storage.c
index 4d82cd3189..9de73f737b 100644
--- a/src/surf/storage.c
+++ b/src/surf/storage.c
@@ -103,7 +103,6 @@ static surf_action_t storage_action_unlink(void *storage, surf_file_t stream)
   xbt_dict_remove(content_dict,stream->name);
 
   free(stream->name);
-  stream->content = NULL;
   xbt_free(stream);
 
   return action;
@@ -152,7 +151,6 @@ static surf_action_t storage_action_close(void *storage, surf_file_t fp)
   }
 
   free(fp->name);
-  fp->content = NULL;
   xbt_free(fp);
   surf_action_t action = storage_action_execute(storage,0, CLOSE);
   return action;
@@ -232,7 +230,7 @@ static void* storage_create_resource(const char* id, const char* model,const cha
 {
   storage_t storage = NULL;
 
-  xbt_assert(!surf_storage_resource_by_name(id),
+  xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
               "Storage '%s' declared several times in the platform file",
               id);
   storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
@@ -277,8 +275,7 @@ static void storage_finalize(void)
   surf_model_exit(surf_storage_model);
   surf_storage_model = NULL;
 
-  if(storage_list)
-    xbt_dynar_free(&storage_list);
+  xbt_dynar_free(&storage_list);
 
   xbt_swag_free
       (storage_running_action_set_that_does_not_need_being_checked);
@@ -593,25 +590,26 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size
 
   surf_stat_t content;
 
-  while ((read = getline(&line, &len, file)) != -1) {
+  while ((read = xbt_getline(&line, &len, file)) != -1) {
+    if (read){
     content = xbt_new0(s_surf_stat_t,1);
     if(sscanf(line,"%s %d %s %s %ld %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) {
-      content->stat.date = xbt_strdup(date);
-      content->stat.group = xbt_strdup(group);
-      content->stat.size = size;
-      content->stat.time = xbt_strdup(time);
-      content->stat.user = xbt_strdup(user);
-      content->stat.user_rights = xbt_strdup(user_rights);
-      *used_size += content->stat.size;
-      xbt_dict_set(parse_content,path,content,NULL);
-    } else {
-      xbt_die("Be sure of passing a good format for content file.\n");
-      // You can generate this kind of file with command line:
-      // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+        content->stat.date = xbt_strdup(date);
+        content->stat.group = xbt_strdup(group);
+        content->stat.size = size;
+        content->stat.time = xbt_strdup(time);
+        content->stat.user = xbt_strdup(user);
+        content->stat.user_rights = xbt_strdup(user_rights);
+        *used_size += content->stat.size;
+        xbt_dict_set(parse_content,path,content,NULL);
+      } else {
+        xbt_die("Be sure of passing a good format for content file.\n");
+        // You can generate this kind of file with command line:
+        // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+      }
     }
   }
-  if (line)
-      free(line);
+  free(line);
   fclose(file);
   return parse_content;
 }
@@ -673,7 +671,7 @@ static void storage_parse_mount(sg_platf_mount_cbarg_t mount)
   XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->id, mount->name);
 
   s_mount_t mnt;
-  mnt.id = surf_storage_resource_by_name(mount->id);
+  mnt.id = surf_storage_resource_priv(surf_storage_resource_by_name(mount->id));
   mnt.name = xbt_strdup(mount->name);
 
   if(!mount_list){