A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics : I activated -pedantic for a quick pass
[simgrid.git]
/
src
/
xbt
/
automaton
/
automaton.c
diff --git
a/src/xbt/automaton/automaton.c
b/src/xbt/automaton/automaton.c
index
fd3e111
..
e732b9c
100644
(file)
--- a/
src/xbt/automaton/automaton.c
+++ b/
src/xbt/automaton/automaton.c
@@
-7,11
+7,8
@@
#include "xbt/automaton.h"
#include <stdio.h> /* printf */
#include "xbt/automaton.h"
#include <stdio.h> /* printf */
-#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/sysdep.h>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_automaton, xbt, "Automaton");
-
struct xbt_automaton_propositional_symbol{
char* pred;
/** Callback used to evaluate the value of the symbol */
struct xbt_automaton_propositional_symbol{
char* pred;
/** Callback used to evaluate the value of the symbol */
@@
-209,9
+206,9
@@
xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
return a->current_state;
}
return a->current_state;
}
-static int call_simple_function(
void* function
)
+static int call_simple_function(
int function(void)
)
{
{
- return
((int (*)(void)) function)
();
+ return
function
();
}
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id,
}
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id,
@@
-219,8
+216,8
@@
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_
{
xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
prop_symb->pred = xbt_strdup(id);
{
xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
prop_symb->pred = xbt_strdup(id);
- prop_symb->callback =
&call_simple_function
;
- prop_symb->data = fct;
+ prop_symb->callback =
((int (*)(void *))&call_simple_function)
;
+ prop_symb->data =
(void*)&
fct;
prop_symb->free_function = NULL;
xbt_dynar_push(a->propositional_symbols, &prop_symb);
return prop_symb;
prop_symb->free_function = NULL;
xbt_dynar_push(a->propositional_symbols, &prop_symb);
return prop_symb;