A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sleep doesn't exist on windows.
[simgrid.git]
/
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
ef70a1c
..
1d34538
100644
(file)
--- a/
src/xbt/xbt_replay_trace_reader.c
+++ b/
src/xbt/xbt_replay_trace_reader.c
@@
-26,7
+26,7
@@
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_assert
2
(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;
@@
-34,8
+34,7
@@
xbt_replay_trace_reader_t xbt_replay_trace_reader_new(const char *filename)
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;
}
@@
-57,7
+56,7
@@
const char **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
) {
+ if (xbt_dynar_
is_empty(d)
) {
xbt_dynar_free(&d);
return xbt_replay_trace_reader_get(reader); /* Get next line */
}
@@
-67,8
+66,7
@@
const char **xbt_replay_trace_reader_get(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);