X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e20d6e2c634bba1e7d1b2ca4e9b7627338655c23..5252dc63eb67dfb17dc307f07d052ec3884a7fa1:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index b8227c19f3..c1f8dd5158 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -22,10 +22,10 @@ static double kill_time = -1.0;
 static void parse_process_init(void)
 {
   parse_host = xbt_strdup(A_surfxml_process_host);
-  xbt_assert1(SIMIX_host_get_by_name(parse_host),
+  xbt_assert(SIMIX_host_get_by_name(parse_host),
               "Host '%s' unknown", parse_host);
   parse_code = SIMIX_get_registered_function(A_surfxml_process_function);
-  xbt_assert1(parse_code, "Function '%s' unknown",
+  xbt_assert(parse_code, "Function '%s' unknown",
               A_surfxml_process_function);
   parse_argc = 0;
   parse_argv = NULL;
@@ -106,7 +106,7 @@ static void parse_process_finalize(void)
 void SIMIX_launch_application(const char *file)
 {
   int parse_status;
-  xbt_assert0(simix_global,
+  xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
   // Reset callbacks
@@ -114,14 +114,14 @@ void SIMIX_launch_application(const char *file)
 
   surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init);
   surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties_XML);
   surfxml_add_callback(ETag_surfxml_process_cb_list,
                        parse_process_finalize);
 
   surf_parse_open(file);
   parse_status = surf_parse();
   surf_parse_close();
-  xbt_assert1(!parse_status, "Parse error in %s", file);
+  xbt_assert(!parse_status, "Parse error in %s", file);
 }
 
 /**
@@ -135,7 +135,7 @@ void SIMIX_launch_application(const char *file)
 XBT_INLINE void SIMIX_function_register(const char *name,
                                         xbt_main_func_t code)
 {
-  xbt_assert0(simix_global,
+  xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_function_register.");
 
   xbt_dict_set(simix_global->registered_functions, name, code, NULL);
@@ -150,7 +150,7 @@ static xbt_main_func_t default_function = NULL;
  */
 void SIMIX_function_register_default(xbt_main_func_t code)
 {
-  xbt_assert0(simix_global,
+  xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_function_register.");
 
   default_function = code;
@@ -167,7 +167,7 @@ void SIMIX_function_register_default(xbt_main_func_t code)
 xbt_main_func_t SIMIX_get_registered_function(const char *name)
 {
   xbt_main_func_t res = NULL;
-  xbt_assert0(simix_global,
+  xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
   res = xbt_dict_get_or_null(simix_global->registered_functions, name);
@@ -190,10 +190,10 @@ void SIMIX_process_set_function(const char *process_host,
 
   /* init process */
   parse_host = xbt_strdup(process_host);
-  xbt_assert1(SIMIX_host_get_by_name(parse_host),
+  xbt_assert(SIMIX_host_get_by_name(parse_host),
               "Host '%s' unknown", parse_host);
   parse_code = SIMIX_get_registered_function(process_function);
-  xbt_assert1(parse_code, "Function '%s' unknown", process_function);
+  xbt_assert(parse_code, "Function '%s' unknown", process_function);
 
   parse_argc = 0;
   parse_argv = NULL;