/* 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"
{
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);
+ free(reader->position);
reader->position = bprintf("%s:%d",reader->filename,reader->linenum);
return reader->position;
}
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) {
+ if (xbt_dynar_is_empty(d)) {
xbt_dynar_free(&d);
return xbt_replay_trace_reader_get(reader); /* Get next line */
}
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);