From 990b9f27efacca95636897ea924c05a98a06a97b Mon Sep 17 00:00:00 2001 From: cherierm Date: Fri, 21 Sep 2007 15:56:46 +0000 Subject: [PATCH] correct usage of function pointer git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4671 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/xbt/graph.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xbt/graph.c b/src/xbt/graph.c index a0f5d9e6ad..c927ef26d9 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -124,9 +124,9 @@ void xbt_graph_edge_set_data(xbt_edge_t edge, void *data) * Free the graph structure. */ void xbt_graph_free_graph(xbt_graph_t g, - void node_free_function(void *ptr), - void edge_free_function(void *ptr), - void graph_free_function(void *ptr)) + void_f_pvoid_t * node_free_function, + void_f_pvoid_t * edge_free_function, + void_f_pvoid_t * graph_free_function) { int cursor = 0; xbt_node_t node = NULL; @@ -137,12 +137,12 @@ void xbt_graph_free_graph(xbt_graph_t g, xbt_dynar_free(&(node->out)); xbt_dynar_free(&(node->in)); if (node_free_function) - node_free_function(node->data); + (*node_free_function)(node->data); } xbt_dynar_foreach(g->edges, cursor, edge) { if (edge_free_function) - edge_free_function(edge->data); + (*edge_free_function)(edge->data); } xbt_dynar_foreach(g->nodes, cursor, node) @@ -199,14 +199,14 @@ void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n, /** @brief remove the given edge from the given graph */ void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, - void free_function(void *ptr)) + void_f_pvoid_t *free_function) { int idx; int cursor = 0; xbt_edge_t edge = NULL; if ((free_function) && (e->data)) - free_function(e->data); + (*free_function)(e->data); xbt_dynar_foreach(g->edges, cursor, edge) { if (edge == e) { -- 2.20.1