X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/226d3997c4e356a1935b7d51b310034b4833afb9..7ea13a508781359049cc52ad576ba66b2c320721:/src/xbt/graph.c

diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index 61b83645f5..5e47cf9598 100644
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -1,14 +1,11 @@
 /* a generic graph library.                                                 */
 
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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"
 #include "xbt/graph.h"
@@ -17,8 +14,10 @@
 #include "xbt/dict.h"
 #include "xbt/heap.h"
 #include "xbt/str.h"
+#include "xbt/file.h"
 
-
+#include <errno.h>
+#include <stdlib.h>
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph");
@@ -317,7 +316,6 @@ double *xbt_graph_get_length_matrix(xbt_graph_t g)
   }
 
   xbt_dynar_foreach(g->nodes, cursor, node) {
-    in_cursor = 0;
     D(cursor, cursor) = 0;
 
     xbt_dynar_foreach(node->out, in_cursor, edge) {
@@ -579,8 +577,8 @@ static void __parse_node(void)
   if (__parse_node_label_and_data)
     node->data = __parse_node_label_and_data(node, A_graphxml_node_label,
                                              A_graphxml_node_data);
-  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);
+  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);
 }
@@ -628,7 +626,7 @@ xbt_graph_t xbt_graph_read(const char *filename,
   ETag_graphxml_edge_fun = __parse_edge;
 
   xbt_graph_parse_open(filename);
-  _XBT_GNUC_UNUSED int res;
+  XBT_ATTRIB_UNUSED int res;
   res = xbt_graph_parse();
   xbt_assert(!res, "Parse error in %s", filename);
   xbt_graph_parse_close();
@@ -725,7 +723,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
       fprintf(file, "label=\"%s\" ", name);
     if ((node_data_print) && ((name = node_data_print(node->data))))
       fprintf(file, "data=\"%s\" ", name);
-    fprintf(file, ">\n");
+    fprintf(file, "/>\n");
   }
   xbt_dynar_foreach(g->edges, cursor, edge) {
     fprintf(file, "  <edge source=\"%p\" target =\"%p\" ",
@@ -736,7 +734,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
       fprintf(file, "length=\"%g\" ", edge->length);
     if ((edge_data_print) && ((name = edge_data_print(edge->data))))
       fprintf(file, "data=\"%s\" ", name);
-    fprintf(file, ">\n");
+    fprintf(file, "/>\n");
   }
   fprintf(file, "</graph>\n");
   fclose(file);
@@ -756,18 +754,18 @@ xbt_graph_t xbt_graph_load (const char *filename)
   //read the number of nodes
   size_t size;
   char *nnodes_str = NULL;
-  read = getline (&nnodes_str, &size, file);
+  read = xbt_getline (&nnodes_str, &size, file);
   if (read == -1)
-    THROWF(system_error, 0, "getline failed to read the number of nodes (errno = %d)", errno);
+    THROWF(system_error, 0, "xbt_getline failed to read the number of nodes (errno = %d)", errno);
   int i, nnodes = atoi (nnodes_str);
   free (nnodes_str);
 
   //read all nodes
   for (i = 0; i < nnodes; i++){
     char *node_str = NULL;
-    read = getline (&node_str, &size, file);
+    read = xbt_getline (&node_str, &size, file);
     if (read == -1)
-      THROWF(system_error, 0, "getline failed to read all nodes (errno = %d)", errno);
+      THROWF(system_error, 0, "xbt_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);
@@ -778,18 +776,18 @@ xbt_graph_t xbt_graph_load (const char *filename)
 
   //read the number of edges
   char *nedges_str = NULL;
-  read = getline (&nedges_str, &size, file);
+  read = xbt_getline (&nedges_str, &size, file);
   if (read == -1)
-    THROWF(system_error, 0, "getline failed to read the number of edges (errno = %d)", errno);
+    THROWF(system_error, 0, "xbt_getline failed to read the number of edges (errno = %d)", errno);
   int nedges = atoi (nedges_str);
   free (nedges_str);
 
   //read all edges
   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);
+    read = xbt_getline (&edge_str, &size, file);
     if (read == -1)
-      THROWF(system_error, 0, "getline failed to read all edges (errno = %d)", errno);
+      THROWF(system_error, 0, "xbt_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);