summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c790c05)
Ensure we print a more meaningful error message when empty metadata
string is encountered.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
char **buf)
{
FILE *in, *out;
char **buf)
{
FILE *in, *out;
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;
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) {
+ /* Warn about empty metadata */
+ fprintf(stderr, "[warning] Empty metadata.\n");
} else {
unsigned int major, minor;
ssize_t nr_items;
} else {
unsigned int major, minor;
ssize_t nr_items;
if (path) {
td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
if (!td) {
if (path) {
td = fmt->open_trace(path, O_RDONLY, packet_seek, NULL);
if (!td) {
- fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n\n",
+ fprintf(stderr, "[warning] [Context] Cannot open_trace of format %s at path %s.\n",
format_name, path);
ret = -1;
goto end;
format_name, path);
ret = -1;
goto end;