Factorize the current_property_set symbol of simix (for process properties) and surf...

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 53dd960..d839e25 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -36,16 +36,12 @@ xbt_dynar_t ETag_surfxml_argument_cb_list = NULL;
 xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
 
+xbt_dict_t current_property_set = NULL;
+  
 static xbt_dynar_t surf_input_buffer_stack = NULL;
 static xbt_dynar_t surf_file_to_parse_stack = NULL;
 
-void surfxml_call_cb_functions(xbt_dynar_t);
-
-void nil_function(void);
-void nil_function(void)
-{
-  return;
-}
+static inline void surfxml_call_cb_functions(xbt_dynar_t);
 
 YY_BUFFER_STATE surf_input_buffer;
 FILE *surf_file_to_parse;
@@ -292,11 +288,12 @@ void surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function)
   xbt_dynar_push(cb_list, &function);
 }
 
-void surfxml_call_cb_functions(xbt_dynar_t cb_list)
+static inline void surfxml_call_cb_functions(xbt_dynar_t cb_list)
 {
   int iterator;
-  void_f_void_t data;
-  xbt_dynar_foreach(cb_list, iterator, data){
-       (*data)();
+  void_f_void_t fun;
+  xbt_dynar_foreach(cb_list, iterator, fun){
+       DEBUG2("call %p %p",fun,*fun);
+       (*fun)();
     }
 }