From e7f673d15e75da1cf81d9d02186fbc936a21ffad Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 4 Nov 2011 09:19:13 +0100 Subject: [PATCH] useless cosmetics --- src/simix/smx_deployment.c | 1 - src/surf/surfxml_parseplatf.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c index 4a21d8c67a..fd027fe437 100644 --- a/src/simix/smx_deployment.c +++ b/src/simix/smx_deployment.c @@ -108,7 +108,6 @@ void SIMIX_launch_application(const char *file) xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application."); - // Reset callbacks surf_parse_reset_callbacks(); surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init); diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c index 6b906efa4f..23865b4a37 100644 --- a/src/surf/surfxml_parseplatf.c +++ b/src/surf/surfxml_parseplatf.c @@ -181,7 +181,6 @@ void parse_platform_file(const char *file) { int parse_status; - surf_parse_reset_callbacks(); surf_parse_add_callback_config(); @@ -193,7 +192,8 @@ void parse_platform_file(const char *file) parse_status = surf_parse(); free_data(); surf_parse_close(); - xbt_assert(!parse_status, "Parse error in %s", file); + if (parse_status) + xbt_die("Parse error in %s", file); surf_config_models_create_elms(); } -- 2.20.1