X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..a5945452ef5b1114fd7c2fab0e865d776775c34d:/src/simdag/sd_daxloader.cpp

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 6eb07fdccc..1b7109c698 100644
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -20,15 +20,9 @@ extern "C" {
   #undef register
 }
 
-bool children_are_marked(SD_task_t task);
-bool parents_are_marked(SD_task_t task);
-
-/* Parsing helpers */
-
 static double dax_parse_double(const char *string)
 {
   double value;
-
   int ret = sscanf(string, "%lg", &value);
   xbt_assert (ret == 1, "Parse error on line %d: %s is not a double", dax_lineno, string);
   return value;
@@ -55,25 +49,23 @@ void uniq_transfer_task_name(SD_task_t task)
   free(new_name);
 }
 
-bool children_are_marked(SD_task_t task){
+static bool children_are_marked(SD_task_t task){
   SD_dependency_t depafter = NULL;
   unsigned int count;
 
   xbt_dynar_foreach(task->tasks_after,count,depafter){
-    if(depafter->dst->marked == 0) {
+    if(depafter->dst->marked == 0)
       return false;
-    }
   }
   return true;
 }
 
-bool parents_are_marked(SD_task_t task){
+static bool parents_are_marked(SD_task_t task){
   SD_dependency_t depbefore = NULL;
   unsigned int count;
   xbt_dynar_foreach(task->tasks_before,count,depbefore){
-    if(depbefore->src->marked == 0) {
+    if(depbefore->src->marked == 0)
       return false;
-    }
   }
   return true;
 }
@@ -305,7 +297,9 @@ xbt_dynar_t SD_daxload(const char *filename)
   }
 
   if (!acyclic_graph_detail(result)){
-    XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", xbt_basename(filename));
+    char* base = xbt_basename(filename);
+    XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", base);
+    free(base);
     xbt_dynar_foreach(result, cpt, file)
       SD_task_destroy(file);
     xbt_dynar_free_container(&result);