X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d435bdefd34324ed0b0c25d1b6eb6dd3b7344524..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surfxml_parseplatf.c diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c index 33498c33c7..c8216efce5 100644 --- a/src/surf/surfxml_parseplatf.c +++ b/src/surf/surfxml_parseplatf.c @@ -9,7 +9,7 @@ #include "xbt/str.h" #include "xbt/dict.h" #include "simgrid/platf.h" -#include "surf/surfxml_parse_private.h" +#include "surf/surfxml_parse.h" #include "surf/surf_private.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -76,10 +76,9 @@ static void parse_Etag_trace(void) tmgr_trace_t trace; if (!trace_file || strcmp(trace_file, "") != 0) { trace = tmgr_trace_new(trace_file); - } else { - if (strcmp(surfxml_pcdata, "") == 0) + } else if (strcmp(surfxml_pcdata, "") == 0) { trace = NULL; - else + } else { trace = tmgr_trace_new_from_string(trace_id, surfxml_pcdata, trace_periodicity); @@ -138,7 +137,7 @@ void parse_platform_file(const char *file) surf_parse_reset_callbacks(); /* Register classical callbacks */ - surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML); + surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); routing_register_callbacks(); /* init the flex parser */