X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e37c1e4bba9bb89cd2842f08cde998eb7f941d04..41d5f3c8a30bf77b309143b174ea5a616b24c5c2:/src/mc/mc_liveness.c diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c index 8f2dadcff5..9b8e3616e6 100644 --- a/src/mc/mc_liveness.c +++ b/src/mc/mc_liveness.c @@ -71,7 +71,7 @@ int reached(xbt_state_t st){ xbt_propositional_symbol_t ps = NULL; xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ f = (int_f_void_t)ps->function; - res = (*f)(); + res = f(); xbt_dynar_push_as(new_pair->prop_ato, int, res); } @@ -155,7 +155,7 @@ void set_pair_reached(xbt_state_t st){ xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ f = (int_f_void_t)ps->function; - res = (*f)(); + res = f(); xbt_dynar_push_as(pair->prop_ato, int, res); } @@ -190,7 +190,7 @@ int visited(xbt_state_t st){ xbt_propositional_symbol_t ps = NULL; xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){ f = (int_f_void_t)ps->function; - res = (*f)(); + res = f(); xbt_dynar_push_as(new_pair->prop_ato, int, res); } @@ -285,7 +285,7 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){ if(strcmp(p->pred, l->u.predicat) == 0){ f = (int_f_void_t)p->function; - return (*f)(); + return f(); } } return -1; @@ -303,7 +303,6 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){ void pair_visited_free(mc_pair_visited_t pair){ if(pair){ - pair->automaton_state = NULL; xbt_dynar_free(&(pair->prop_ato)); MC_free_snapshot(pair->system_state); xbt_free(pair); @@ -337,7 +336,6 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){ void pair_reached_free(mc_pair_reached_t pair){ if(pair){ - pair->automaton_state = NULL; xbt_dynar_free(&(pair->prop_ato)); MC_free_snapshot(pair->system_state); xbt_free(pair);