[gras] Don't define variables twice.

[simgrid.git] / tools / gras / stub_generator.c

diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index 123911a..dfe760c 100644 (file)
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -22,11 +22,8 @@
 #include "gras_stub_generator.h"
 #include <stdarg.h>
 
-
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen, gras, "Stub generator");
 
-
 #ifdef _XBT_WIN32
 #include <windows.h>
 #endif
@@ -43,6 +40,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen, gras, "Stub generator");
 xbt_dict_t process_function_set = NULL;
 xbt_dynar_t process_list = NULL;
 xbt_dict_t machine_set = NULL;
+char *warning = NULL;
 
 void s_process_free(void *process)
 {
@@ -65,7 +63,7 @@ static void parse_process_init(void)
   process.argv = xbt_new(char *, 1);
   process.argv[0] = xbt_strdup(A_surfxml_process_function);
   process.host = strdup(A_surfxml_process_host);
-  /*VERB1("Function: %s",A_surfxml_process_function); */
+  /*XBT_VERB("Function: %s",A_surfxml_process_function); */
 }
 
 static void parse_argument(void)
@@ -79,7 +77,7 @@ static void parse_argument(void)
 static void parse_process_finalize(void)
 {
   xbt_dynar_push(process_list, &process);
-  /*VERB1("Function: %s",process.argv[0]); */
+  /*XBT_VERB("Function: %s",process.argv[0]); */
 }
 
 /*FIXME Defined in surfxml_parse.c*/
@@ -122,14 +120,14 @@ int main(int argc, char *argv[])
     }
   }
 
-  xbt_assert1((argc >= 3),
+  xbt_assert((argc >= 3),
               "Usage: %s project_name deployment_file [deployment_file...]\n",
               argv[0]);
 
   project_name = argv[1];
 
   surf_parse_reset_callbacks();
-  DEBUG2("%p %p", parse_process_init, &parse_process_init);
+  XBT_DEBUG("%p %p", parse_process_init, &parse_process_init);
   surfxml_add_callback(STag_surfxml_process_cb_list, &parse_process_init);
   surfxml_add_callback(ETag_surfxml_argument_cb_list, &parse_argument);
   surfxml_add_callback(ETag_surfxml_process_cb_list,
@@ -139,7 +137,7 @@ int main(int argc, char *argv[])
     deployment_file = argv[i];
     surf_parse_open(deployment_file);
     if (surf_parse())
-      xbt_assert1(0, "Parse error in %s", deployment_file);
+      xbt_die("Parse error in %s", deployment_file);
 
     surf_parse_close();
   }
@@ -156,7 +154,7 @@ int main(int argc, char *argv[])
      for (cursor=NULL, xbt_dict_cursor_first((process_function_set),&(cursor)) ;
      xbt_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data));
      xbt_dict_cursor_step(cursor) ) {
-     DEBUG1("Function %s", key);      
+     XBT_DEBUG("Function %s", key);
      }
 
      xbt_dict_dump(process_function_set,print);
@@ -176,6 +174,11 @@ int main(int argc, char *argv[])
 #endif
 
   free(warning);
+
+  xbt_dict_free(&process_function_set);
+  xbt_dynar_free(&process_list);
+  xbt_dict_free(&machine_set);
   surf_exit();
+
   return 0;
 }