X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..1189d1797cc934d847d6641d809bbe060729f064:/src/xbt/graphxml_parse.c diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c index 01198fa8f8..34ada6c954 100644 --- a/src/xbt/graphxml_parse.c +++ b/src/xbt/graphxml_parse.c @@ -83,20 +83,20 @@ void ETag_graphxml_edge(void) void xbt_graph_parse_open(const char *file) { if (!file) { - WARN0 - ("I hope you know what you're doing... you just gave me a NULL pointer!"); + XBT_WARN + ("I hope you know what you're doing... you just gave me a NULL pointer!"); return; } if (!xbt_graph_input_buffer_stack) xbt_graph_input_buffer_stack = - xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL); + xbt_dynar_new(sizeof(YY_BUFFER_STATE), NULL); if (!xbt_graph_file_to_parse_stack) xbt_graph_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL); xbt_graph_file_to_parse = fopen(file, "r"); /* FIXME should use something like surf_fopen */ - xbt_assert1((xbt_graph_file_to_parse), "Unable to open \"%s\"\n", file); + xbt_assert((xbt_graph_file_to_parse), "Unable to open \"%s\"\n", file); xbt_graph_input_buffer = - xbt_graph_parse__create_buffer(xbt_graph_file_to_parse, 10); + xbt_graph_parse__create_buffer(xbt_graph_file_to_parse, 10); xbt_graph_parse__switch_to_buffer(xbt_graph_input_buffer); xbt_graph_parse_lineno = 1; } @@ -127,6 +127,6 @@ void xbt_graph_parse_get_double(double *value, const char *string) int ret = 0; ret = sscanf(string, "%lg", value); - xbt_assert2((ret == 1), "Parse error line %d : %s not a number", + xbt_assert((ret == 1), "Parse error line %d : %s not a number", xbt_graph_parse_lineno, string); }