* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid_config.h" /* getline */
+#include <errno.h>
#include <stdlib.h>
#include "xbt/sysdep.h"
#include "xbt/log.h"
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)
free(edge);
xbt_dynar_free(&(g->edges));
if (graph_free_function)
- (*graph_free_function) (g->data);
+ graph_free_function(g->data);
free(g);
xbt_graph_parse_lex_destroy();
return;
}
if ((node_free_function) && (n->data))
- (*node_free_function) (n->data);
+ node_free_function(n->data);
cursor = 0;
xbt_dynar_foreach(g->nodes, cursor, node)
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) {
if (__parse_node_label_and_data)
node->data = __parse_node_label_and_data(node, A_graphxml_node_label,
A_graphxml_node_data);
- xbt_graph_parse_get_double(&(node->position_x),
- A_graphxml_node_position_x);
- xbt_graph_parse_get_double(&(node->position_y),
- A_graphxml_node_position_y);
+ node->position_x = xbt_graph_parse_get_double(A_graphxml_node_position_x);
+ node->position_y = xbt_graph_parse_get_double(A_graphxml_node_position_y);
xbt_dict_set(parsed_nodes, A_graphxml_node_name, (void *) node, NULL);
}
edge->data = __parse_edge_label_and_data(edge, A_graphxml_edge_label,
A_graphxml_edge_data);
- xbt_graph_parse_get_double(&(edge->length), A_graphxml_edge_length);
+ edge->length = xbt_graph_parse_get_double(A_graphxml_edge_length);
XBT_DEBUG("<edge source=\"%s\" target=\"%s\" length=\"%f\"/>",
(char *) (edge->src)->data,
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
- int res;
- res = (*xbt_graph_parse) ();
+ _XBT_GNUC_UNUSED int res;
+ res = xbt_graph_parse();
xbt_assert(!res, "Parse error in %s", filename);
xbt_graph_parse_close();
size_t size;
char *nnodes_str = NULL;
read = getline (&nnodes_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "getline failed to read the number of nodes (errno = %d)", errno);
int i, nnodes = atoi (nnodes_str);
free (nnodes_str);
for (i = 0; i < nnodes; i++){
char *node_str = NULL;
read = getline (&node_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "getline failed to read all nodes (errno = %d)", errno);
xbt_node_t n;
char *name = xbt_strdup (node_str);
xbt_str_subst (name, '\n', '\0', 0);
//read the number of edges
char *nedges_str = NULL;
read = getline (&nedges_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "getline failed to read the number of edges (errno = %d)", errno);
int nedges = atoi (nedges_str);
free (nedges_str);
for (i = 0; i < nedges; i++){
char *edge_str = NULL, edge_id[200], node_source[200], node_target[200];
read = getline (&edge_str, &size, file);
+ if (read == -1)
+ THROWF(system_error, 0, "getline failed to read all edges (errno = %d)", errno);
sscanf (edge_str, "%s %s %s", edge_id, node_source, node_target);
free (edge_str);
xbt_str_subst (edge_id, '\n', '\0', 0);
xbt_node_t source = xbt_dict_get (nodes_dict, node_source);
xbt_node_t target = xbt_dict_get (nodes_dict, node_target);
- xbt_edge_t e;
- e = xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id));
+ xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id));
}
xbt_dict_free (&nodes_dict);
return ret;