projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Babeltrace ctf-text duplicated error message
[babeltrace.git]
/
formats
/
ctf-text
/
ctf-text.c
diff --git
a/formats/ctf-text/ctf-text.c
b/formats/ctf-text/ctf-text.c
index 20e18e86fcf1e952c8f090db3dff58eb430a3e76..92ad42632ece6049e5153d15325ff47a6ff14695 100644
(file)
--- a/
formats/ctf-text/ctf-text.c
+++ b/
formats/ctf-text/ctf-text.c
@@
-22,8
+22,8
@@
#include <babeltrace/ctf-text/types.h>
#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf-text/types.h>
#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/ctf/events-internal.h>
#include <inttypes.h>
#include <inttypes.h>
-#include <uuid/uuid.h>
#include <sys/mman.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
#include <sys/types.h>
@@
-211,15
+211,15
@@
const char *print_loglevel(int value)
}
static
}
static
-int ctf_text_write_event(struct stream_pos *ppos,
- struct ctf_stream *stream)
+int ctf_text_write_event(struct stream_pos *ppos,
struct ctf_stream_definition *stream)
+
{
struct ctf_text_stream_pos *pos =
container_of(ppos, struct ctf_text_stream_pos, parent);
{
struct ctf_text_stream_pos *pos =
container_of(ppos, struct ctf_text_stream_pos, parent);
- struct ctf_stream_
class
*stream_class = stream->stream_class;
+ struct ctf_stream_
declaration
*stream_class = stream->stream_class;
int field_nr_saved;
int field_nr_saved;
- struct ctf_event *event_class;
- struct ctf_
stream_event
*event;
+ struct ctf_event
_declaration
*event_class;
+ struct ctf_
event_definition
*event;
uint64_t id;
int ret;
int dom_print = 0;
uint64_t id;
int ret;
int dom_print = 0;
@@
-236,8
+236,8
@@
int ctf_text_write_event(struct stream_pos *ppos,
return -EINVAL;
}
event_class = g_ptr_array_index(stream_class->events_by_id, id);
return -EINVAL;
}
event_class = g_ptr_array_index(stream_class->events_by_id, id);
- if (!event) {
- fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id);
+ if (!event
_class
) {
+ fprintf(stderr, "[error] Event
class
id %" PRIu64 " is unknown.\n", id);
return -EINVAL;
}
return -EINVAL;
}
This page took
0.023813 seconds
and
4
git commands to generate.