X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfc9b3ffef6e41c90e64b271ed981fabe05676cc..c594594f3bf33a81f7641cfb20b915ded71431de:/src/xbt/graphxml_parse.c

diff --git a/src/xbt/graphxml_parse.c b/src/xbt/graphxml_parse.c
index e5b7f1037f..5768ea0268 100644
--- a/src/xbt/graphxml_parse.c
+++ b/src/xbt/graphxml_parse.c
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/misc.h"
+#include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
@@ -25,56 +26,56 @@ static void nil_function(void)
   return;
 }
 
-void_f_void_t STag_graph_fun = nil_function;
-void_f_void_t ETag_graph_fun = nil_function;
-void_f_void_t STag_node_fun = nil_function;
-void_f_void_t ETag_node_fun = nil_function;
-void_f_void_t STag_edge_fun = nil_function;
-void_f_void_t ETag_edge_fun = nil_function;
+void_f_void_t STag_graphxml_graph_fun = nil_function;
+void_f_void_t ETag_graphxml_graph_fun = nil_function;
+void_f_void_t STag_graphxml_node_fun = nil_function;
+void_f_void_t ETag_graphxml_node_fun = nil_function;
+void_f_void_t STag_graphxml_edge_fun = nil_function;
+void_f_void_t ETag_graphxml_edge_fun = nil_function;
 
 YY_BUFFER_STATE xbt_graph_input_buffer;
 FILE *xbt_graph_file_to_parse;
 
 void xbt_graph_parse_reset_parser(void)
 {
-  STag_graph_fun = nil_function;
-  ETag_graph_fun = nil_function;
-  STag_node_fun = nil_function;
-  ETag_node_fun = nil_function;
-  STag_edge_fun = nil_function;
-  ETag_edge_fun = nil_function;
+  STag_graphxml_graph_fun = nil_function;
+  ETag_graphxml_graph_fun = nil_function;
+  STag_graphxml_node_fun = nil_function;
+  ETag_graphxml_node_fun = nil_function;
+  STag_graphxml_edge_fun = nil_function;
+  ETag_graphxml_edge_fun = nil_function;
 }
 
-void STag_graph(void)
+void STag_graphxml_graph(void)
 {
-  STag_graph_fun();
+  (*STag_graphxml_graph_fun)();
 }
 
-void ETag_graph(void)
+void ETag_graphxml_graph(void)
 {
-  ETag_graph_fun();
+  (*ETag_graphxml_graph_fun)();
 }
 
 
-void STag_node(void)
+void STag_graphxml_node(void)
 {
-  STag_node_fun();
+  (*STag_graphxml_node_fun)();
 }
 
-void ETag_node(void)
+void ETag_graphxml_node(void)
 {
-  ETag_node_fun();
+  (*ETag_graphxml_node_fun)();
 }
 
 
-void STag_edge(void)
+void STag_graphxml_edge(void)
 {
-  STag_edge_fun();
+  (*STag_graphxml_edge_fun)();
 }
 
-void ETag_edge(void)
+void ETag_graphxml_edge(void)
 {
-  ETag_edge_fun();
+  (*ETag_graphxml_edge_fun)();
 }
 
 
@@ -84,9 +85,9 @@ void  xbt_graph_parse_open(const char *file) {
     WARN0("I hope you know what you're doing... you just gave me a NULL pointer!");
     return;
   }
-  if(!xbt_graph_input_buffer_stack) 
+  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) 
+  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 */
@@ -97,9 +98,9 @@ void  xbt_graph_parse_open(const char *file) {
 }
 
 void  xbt_graph_parse_close(void) {
-  if(xbt_graph_input_buffer_stack) 
+  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) {
@@ -117,11 +118,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)
-{ 
+{
   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);
+              string);
 }