projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup error messages
[babeltrace.git]
/
formats
/
ctf
/
ctf.c
diff --git
a/formats/ctf/ctf.c
b/formats/ctf/ctf.c
index deb9a66d195d989d98373346423ca407d9dde494..552133c3238719ecc63a1acfb2fa3f27831b24ab 100644
(file)
--- a/
formats/ctf/ctf.c
+++ b/
formats/ctf/ctf.c
@@
-961,7
+961,7
@@
int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
char **buf)
{
FILE *in, *out;
char **buf)
{
FILE *in, *out;
- size_t size;
+ size_t size
, buflen
;
int ret;
in = *fp;
int ret;
in = *fp;
@@
-1003,7
+1003,12
@@
int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
perror("Error in fclose");
}
/* open for reading */
perror("Error in fclose");
}
/* open for reading */
- *fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb");
+ buflen = strlen(*buf);
+ if (!buflen) {
+ *fp = NULL;
+ return -ENODATA;
+ }
+ *fp = babeltrace_fmemopen(*buf, buflen, "rb");
if (!*fp) {
perror("Metadata fmemopen");
return -errno;
if (!*fp) {
perror("Metadata fmemopen");
return -errno;
@@
-1060,8
+1065,11
@@
int ctf_open_trace_metadata_read(struct ctf_trace *td,
if (packet_metadata(td, fp)) {
ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
if (packet_metadata(td, fp)) {
ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf);
- if (ret)
+ if (ret) {
+ /* Warn about empty metadata */
+ fprintf(stderr, "[warning] Empty metadata.\n");
goto end_packet_read;
goto end_packet_read;
+ }
} else {
unsigned int major, minor;
ssize_t nr_items;
} else {
unsigned int major, minor;
ssize_t nr_items;
This page took
0.024534 seconds
and
4
git commands to generate.