-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
void STag_graphxml_graph(void)
{
- (*STag_graphxml_graph_fun) ();
+ STag_graphxml_graph_fun();
}
void ETag_graphxml_graph(void)
{
- (*ETag_graphxml_graph_fun) ();
+ ETag_graphxml_graph_fun();
}
void STag_graphxml_node(void)
{
- (*STag_graphxml_node_fun) ();
+ STag_graphxml_node_fun();
}
void ETag_graphxml_node(void)
{
- (*ETag_graphxml_node_fun) ();
+ ETag_graphxml_node_fun();
}
void STag_graphxml_edge(void)
{
- (*STag_graphxml_edge_fun) ();
+ STag_graphxml_edge_fun();
}
void ETag_graphxml_edge(void)
{
- (*ETag_graphxml_edge_fun) ();
+ ETag_graphxml_edge_fun();
}
xbt_graph_file_to_parse_stack = xbt_dynar_new(sizeof(FILE *), NULL);
xbt_graph_file_to_parse = fopen(file, "r"); /* FIXME should use something like surf_fopen */
- xbt_assert1((xbt_graph_file_to_parse), "Unable to open \"%s\"\n", file);
+ xbt_assert((xbt_graph_file_to_parse), "Unable to open \"%s\"\n", file);
xbt_graph_input_buffer =
xbt_graph_parse__create_buffer(xbt_graph_file_to_parse, 10);
xbt_graph_parse__switch_to_buffer(xbt_graph_input_buffer);
void xbt_graph_parse_close(void)
{
- if (xbt_graph_input_buffer_stack)
- xbt_dynar_free(&xbt_graph_input_buffer_stack);
- if (xbt_graph_file_to_parse_stack)
- xbt_dynar_free(&xbt_graph_file_to_parse_stack);
+ xbt_dynar_free(&xbt_graph_input_buffer_stack);
+ xbt_dynar_free(&xbt_graph_file_to_parse_stack);
if (xbt_graph_file_to_parse) {
xbt_graph_parse__delete_buffer(xbt_graph_input_buffer);
int_f_void_t xbt_graph_parse = _xbt_graph_parse;
-void xbt_graph_parse_get_double(double *value, const char *string)
+double xbt_graph_parse_get_double(const char *string)
{
- int ret = 0;
+ double result;
+ _XBT_GNUC_UNUSED int ret = 0;
- ret = sscanf(string, "%lg", value);
- xbt_assert2((ret == 1), "Parse error line %d : %s not a number",
+ ret = sscanf(string, "%lg", &result);
+ xbt_assert((ret == 1), "Parse error line %d : %s not a number",
xbt_graph_parse_lineno, string);
+ return result;
}