projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix multi-packet packet-based metadata
[babeltrace.git]
/
formats
/
ctf
/
ctf.c
diff --git
a/formats/ctf/ctf.c
b/formats/ctf/ctf.c
index ac064b809995ea72e06e84b85821292d6351e873..13c87eae176651fe97b1fd0c25d3871e5f02f6a4 100644
(file)
--- a/
formats/ctf/ctf.c
+++ b/
formats/ctf/ctf.c
@@
-465,11
+465,7
@@
int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
}
toread -= readlen;
if (!toread) {
}
toread -= readlen;
if (!toread) {
- ret = -EOF;
- break;
- }
- if (feof(in)) {
- ret = -EINVAL;
+ ret = 0; /* continue reading next packet */
break;
}
}
break;
}
}
@@
-491,10
+487,11
@@
int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
for (;;) {
ret = ctf_open_trace_metadata_packet_read(td, in, out);
for (;;) {
ret = ctf_open_trace_metadata_packet_read(td, in, out);
- if (ret == -EOF) {
- ret = 0;
+ if (ret) {
break;
break;
- } else if (ret) {
+ }
+ if (feof(in)) {
+ ret = 0;
break;
}
}
break;
}
}
This page took
0.024436 seconds
and
4
git commands to generate.