projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bt_context_add_traces_recursive error code
[babeltrace.git]
/
converter
/
babeltrace.c
diff --git
a/converter/babeltrace.c
b/converter/babeltrace.c
index c377935edb4eee708113d50dd86ac5e6c54edb1a..56772674a8d8b629764a5b01e0ccdef49d295ad9 100644
(file)
--- a/
converter/babeltrace.c
+++ b/
converter/babeltrace.c
@@
-355,6
+355,7
@@
int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
while ((node = fts_read(tree))) {
int dirfd, metafd;
while ((node = fts_read(tree))) {
int dirfd, metafd;
+ int closeret;
if (!(node->fts_info & FTS_D))
continue;
if (!(node->fts_info & FTS_D))
continue;
@@
-368,11
+369,13
@@
int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
}
metafd = openat(dirfd, "metadata", O_RDONLY);
if (metafd < 0) {
}
metafd = openat(dirfd, "metadata", O_RDONLY);
if (metafd < 0) {
- ret = close(dirfd);
- if (ret < 0) {
+
close
ret = close(dirfd);
+ if (
close
ret < 0) {
perror("close");
goto error;
}
perror("close");
goto error;
}
+ ret = -1;
+ continue;
} else {
int trace_id;
} else {
int trace_id;
This page took
0.023213 seconds
and
4
git commands to generate.