Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169503
b: refs/heads/master
c: 0d1da91
h: refs/heads/master
i:
  169501: e1c97ff
  169499: 7a36188
  169495: c9a8d34
  169487: cf644a8
  169471: 81ebf26
v: v3
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Oct 15, 2009
1 parent cd70162 commit 6399427
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ffa1895561645103d8f8059b35d9c06e6eeead2e
refs/heads/master: 0d1da915c76838c9ee7af7cdefbcb2bae9424161
5 changes: 4 additions & 1 deletion trunk/tools/perf/util/trace-event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -1819,7 +1819,7 @@ static int event_read_print(struct event *event)
if (ret < 0)
return -1;

return 0;
return ret;

fail:
free_token(token);
Expand Down Expand Up @@ -3088,6 +3088,9 @@ int parse_ftrace_file(char *buf, unsigned long size)
if (ret < 0)
die("failed to read ftrace event print fmt");

/* New ftrace handles args */
if (ret > 0)
return 0;
/*
* The arguments for ftrace files are parsed by the fields.
* Set up the fields as their arguments.
Expand Down

0 comments on commit 6399427

Please sign in to comment.