| Message ID | 20210630141913.20675-1-y.karadz@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | libtraceevent: Fix bug in tep_print_event() | expand |
On Wed, 30 Jun 2021 17:19:13 +0300 "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote: > { > struct print_event_type type; > - char *format = strdup(fmt); > - char *current = format; > - char *str = format; > + char *format, *current, *str; Nit, but please keep the above each on a separate line. char *current; char *format; char *str; I try to avoid having pointers on a single line, it's just easier to manage when they are separate. Thanks! -- Steve > int offset; > va_list args; > struct tep_event *event; > > + event = tep_find_event_by_record(tep, record); > + if (!event) { > + trace_seq_printf(s, "[UNKNOWN EVENT]"); > + return; > + } > + > + str = current = format = strdup(fmt); > if (!format) > return;
On 30.06.21 г. 18:06, Steven Rostedt wrote: > On Wed, 30 Jun 2021 17:19:13 +0300 > "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote: > >> { >> struct print_event_type type; >> - char *format = strdup(fmt); >> - char *current = format; >> - char *str = format; >> + char *format, *current, *str; > > Nit, but please keep the above each on a separate line. > > char *current; > char *format; > char *str; > > I try to avoid having pointers on a single line, it's just easier to > manage when they are separate. I am sorry! I somehow forgot that we already discussed this before. Should I send v2? Thanks, Y. > > Thanks! > > -- Steve > >> int offset; >> va_list args; >> struct tep_event *event; >> >> + event = tep_find_event_by_record(tep, record); >> + if (!event) { >> + trace_seq_printf(s, "[UNKNOWN EVENT]"); >> + return; >> + } >> + >> + str = current = format = strdup(fmt); >> if (!format) >> return;
On Wed, 30 Jun 2021 21:37:48 +0300 "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote: > On 30.06.21 г. 18:06, Steven Rostedt wrote: > > On Wed, 30 Jun 2021 17:19:13 +0300 > > "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> wrote: > > > >> { > >> struct print_event_type type; > >> - char *format = strdup(fmt); > >> - char *current = format; > >> - char *str = format; > >> + char *format, *current, *str; > > > > Nit, but please keep the above each on a separate line. > > > > char *current; > > char *format; > > char *str; > > > > I try to avoid having pointers on a single line, it's just easier to > > manage when they are separate. > > I am sorry! > I somehow forgot that we already discussed this before. > Should I send v2? > Yeah, if it's not too much of a hassle. Thanks, -- Steve
On 30.06.21 г. 21:50, Steven Rostedt wrote: >> Should I send v2? >> > Yeah, if it's not too much of a hassle. Done. Thanks! Y.
diff --git a/src/event-parse.c b/src/event-parse.c index de28b3b..d3f1bba 100644 --- a/src/event-parse.c +++ b/src/event-parse.c @@ -6418,17 +6418,21 @@ void tep_print_event(struct tep_handle *tep, struct trace_seq *s, struct tep_record *record, const char *fmt, ...) { struct print_event_type type; - char *format = strdup(fmt); - char *current = format; - char *str = format; + char *format, *current, *str; int offset; va_list args; struct tep_event *event; + event = tep_find_event_by_record(tep, record); + if (!event) { + trace_seq_printf(s, "[UNKNOWN EVENT]"); + return; + } + + str = current = format = strdup(fmt); if (!format) return; - event = tep_find_event_by_record(tep, record); va_start(args, fmt); while (*current) { current = strchr(str, '%');
We must handle the case when the "tep_event" object is not found. Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> --- src/event-parse.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)