X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcccdc1509fa82173ee3eee9967a8a20fed4ed4d..c5cfdf988dc28c64bae948c5a749d0b44e881426:/src/xbt/xbt_replay_trace_reader.c

diff --git a/src/xbt/xbt_replay_trace_reader.c b/src/xbt/xbt_replay_trace_reader.c
index 78031b6f21..1d34538bab 100644
--- a/src/xbt/xbt_replay_trace_reader.c
+++ b/src/xbt/xbt_replay_trace_reader.c
@@ -3,8 +3,9 @@
 
 /* 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" //For getline, keep that include first
+
 #include "gras_config.h"
-#include "simgrid_config.h" /* getline */
 #include <errno.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -21,26 +22,29 @@ typedef struct s_replay_trace_reader {
   char *filename; int linenum;
 } s_xbt_replay_trace_reader_t;
 
-xbt_replay_trace_reader_t xbt_replay_trace_reader_new(const char*filename) {
+xbt_replay_trace_reader_t xbt_replay_trace_reader_new(const char *filename)
+{
   xbt_replay_trace_reader_t res = xbt_new0(s_xbt_replay_trace_reader_t,1);
   res->fp = fopen(filename, "r");
-  xbt_assert2(res->fp != NULL, "Cannot open %s: %s", filename,
+  xbt_assert(res->fp != NULL, "Cannot open %s: %s", filename,
       strerror(errno));
   res->filename = xbt_strdup(filename);
   return res;
 }
 
-const char *xbt_replay_trace_reader_position(xbt_replay_trace_reader_t reader) {
-  if (reader->position)
-    free(reader->position);
+const char *xbt_replay_trace_reader_position(xbt_replay_trace_reader_t reader)
+{
+  free(reader->position);
   reader->position = bprintf("%s:%d",reader->filename,reader->linenum);
-  return (const char*)reader->position;
+  return reader->position;
 }
-char * const *xbt_replay_trace_reader_get(xbt_replay_trace_reader_t reader) {
+
+const char **xbt_replay_trace_reader_get(xbt_replay_trace_reader_t reader)
+{
   ssize_t read;
   xbt_dynar_t d;
   read = getline(&reader->line, &reader->line_len, reader->fp);
-  //INFO1("got from trace: %s",reader->line);
+  //XBT_INFO("got from trace: %s",reader->line);
   reader->linenum++;
   if (read==-1)
     return NULL; /* end of file */
@@ -52,17 +56,17 @@ char * const *xbt_replay_trace_reader_get(xbt_replay_trace_reader_t reader) {
     return xbt_replay_trace_reader_get(reader); /* Get next line */
 
   d=xbt_str_split_quoted_in_place(reader->line);
-  if (xbt_dynar_length(d)==0) {
-    xbt_free(d);
+  if (xbt_dynar_is_empty(d)) {
+    xbt_dynar_free(&d);
     return xbt_replay_trace_reader_get(reader); /* Get next line */
   }
   return xbt_dynar_to_array(d);
 }
 
-void xbt_replay_trace_reader_free(xbt_replay_trace_reader_t *reader) {
+void xbt_replay_trace_reader_free(xbt_replay_trace_reader_t *reader)
+{
   free((*reader)->filename);
-  if ((*reader)->position)
-    free((*reader)->position);
+  free((*reader)->position);
   fclose((*reader)->fp);
   free((*reader)->line);
   free(*reader);