X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95d328f9ca4dd6ccd2065c6c84aca83d43001804..dff9e15c44ab6340d27215957c56fa72fad246a2:/src/xbt/graphxml_parse.c diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c index 5768ea0268..d2517617de 100644 --- a/src/xbt/graphxml_parse.c +++ b/src/xbt/graphxml_parse.c @@ -13,13 +13,14 @@ #include "xbt/dynar.h" #include "xbt/graphxml_parse.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(graphxml_parse, xbt ,"Logging specific to the graphxml parsing module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(graphxml_parse, xbt, + "Logging specific to the graphxml parsing module"); #undef CLEANUP #include "graphxml.c" -static xbt_dynar_t xbt_graph_input_buffer_stack=NULL; -static xbt_dynar_t xbt_graph_file_to_parse_stack=NULL; +static xbt_dynar_t xbt_graph_input_buffer_stack = NULL; +static xbt_dynar_t xbt_graph_file_to_parse_stack = NULL; static void nil_function(void) { @@ -48,62 +49,67 @@ void xbt_graph_parse_reset_parser(void) void STag_graphxml_graph(void) { - (*STag_graphxml_graph_fun)(); + (*STag_graphxml_graph_fun) (); } void ETag_graphxml_graph(void) { - (*ETag_graphxml_graph_fun)(); + (*ETag_graphxml_graph_fun) (); } void STag_graphxml_node(void) { - (*STag_graphxml_node_fun)(); + (*STag_graphxml_node_fun) (); } void ETag_graphxml_node(void) { - (*ETag_graphxml_node_fun)(); + (*ETag_graphxml_node_fun) (); } void STag_graphxml_edge(void) { - (*STag_graphxml_edge_fun)(); + (*STag_graphxml_edge_fun) (); } void ETag_graphxml_edge(void) { - (*ETag_graphxml_edge_fun)(); + (*ETag_graphxml_edge_fun) (); } -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!"); +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!"); return; } - if(!xbt_graph_input_buffer_stack) - xbt_graph_input_buffer_stack = 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_graph_input_buffer = xbt_graph_parse__create_buffer( xbt_graph_file_to_parse, 10); + if (!xbt_graph_input_buffer_stack) + xbt_graph_input_buffer_stack = + 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_graph_input_buffer = + 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; } -void xbt_graph_parse_close(void) { - if(xbt_graph_input_buffer_stack) +void xbt_graph_parse_close(void) +{ + if (xbt_graph_input_buffer_stack) xbt_dynar_free(&xbt_graph_input_buffer_stack); - if(xbt_graph_file_to_parse_stack) + if (xbt_graph_file_to_parse_stack) xbt_dynar_free(&xbt_graph_file_to_parse_stack); - if(xbt_graph_file_to_parse) { + if (xbt_graph_file_to_parse) { xbt_graph_parse__delete_buffer(xbt_graph_input_buffer); fclose(xbt_graph_file_to_parse); } @@ -117,12 +123,11 @@ static int _xbt_graph_parse(void) int_f_void_t xbt_graph_parse = _xbt_graph_parse; -void xbt_graph_parse_get_double(double *value,const char *string) +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_graph_parse_lineno, - string); + xbt_assert2((ret == 1), "Parse error line %d : %s not a number", + xbt_graph_parse_lineno, string); } -