diff options
author | Steven Rostedt <srostedt@redhat.com> | 2009-12-17 22:38:35 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2009-12-17 22:38:35 -0500 |
commit | 0b9d85ae412ab92c2690523e1ef4314bc7931a68 (patch) | |
tree | bc982e16f60192648d01150d4d6da31df5c18b75 /plugin_mac80211.c | |
parent | 845c4b74c8ee72771819c4735df6ff5f5f229e8e (diff) |
trace-cmd: Rename struct event to struct event_format
Calling the event format parser "struct event" may lead
to confusion about if the struct actually represents an instance
of an event instead of what it really is: a format descriptor.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'plugin_mac80211.c')
-rw-r--r-- | plugin_mac80211.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugin_mac80211.c b/plugin_mac80211.c index 7758b58..766d9ce 100644 --- a/plugin_mac80211.c +++ b/plugin_mac80211.c | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | /* return -1 (field not found/not valid number), 0 (ok), 1 (buffer full) */ | 9 | /* return -1 (field not found/not valid number), 0 (ok), 1 (buffer full) */ |
10 | static int _print_field(struct trace_seq *s, const char *fmt, | 10 | static int _print_field(struct trace_seq *s, const char *fmt, |
11 | struct event *event, const char *name, const void *data) | 11 | struct event_format *event, const char *name, const void *data) |
12 | { | 12 | { |
13 | struct format_field *f = pevent_find_field(event, name); | 13 | struct format_field *f = pevent_find_field(event, name); |
14 | unsigned long long val; | 14 | unsigned long long val; |
@@ -24,7 +24,7 @@ static int _print_field(struct trace_seq *s, const char *fmt, | |||
24 | 24 | ||
25 | /* return 0 (ok), 1 (buffer full) */ | 25 | /* return 0 (ok), 1 (buffer full) */ |
26 | static void print_field(struct trace_seq *s, const char *fmt, | 26 | static void print_field(struct trace_seq *s, const char *fmt, |
27 | struct event *event, const char *name, const void *data) | 27 | struct event_format *event, const char *name, const void *data) |
28 | { | 28 | { |
29 | int ret = _print_field(s, fmt, event, name, data); | 29 | int ret = _print_field(s, fmt, event, name, data); |
30 | 30 | ||
@@ -32,7 +32,7 @@ static void print_field(struct trace_seq *s, const char *fmt, | |||
32 | trace_seq_printf(s, "NOTFOUND:%s", name); | 32 | trace_seq_printf(s, "NOTFOUND:%s", name); |
33 | } | 33 | } |
34 | 34 | ||
35 | static void print_string(struct trace_seq *s, struct event *event, | 35 | static void print_string(struct trace_seq *s, struct event_format *event, |
36 | const char *name, const void *data) | 36 | const char *name, const void *data) |
37 | { | 37 | { |
38 | struct format_field *f = pevent_find_field(event, name); | 38 | struct format_field *f = pevent_find_field(event, name); |
@@ -65,7 +65,7 @@ struct value_name { | |||
65 | const char *name; | 65 | const char *name; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | static void _print_enum(struct trace_seq *s, struct event *event, | 68 | static void _print_enum(struct trace_seq *s, struct event_format *event, |
69 | const char *name, const void *data, | 69 | const char *name, const void *data, |
70 | const struct value_name *names, int n_names) | 70 | const struct value_name *names, int n_names) |
71 | { | 71 | { |
@@ -98,7 +98,7 @@ static void _print_enum(struct trace_seq *s, struct event *event, | |||
98 | _print_enum(s, ev, name, data, __n, sizeof(__n)/sizeof(__n[0])); \ | 98 | _print_enum(s, ev, name, data, __n, sizeof(__n)/sizeof(__n[0])); \ |
99 | }) | 99 | }) |
100 | 100 | ||
101 | static void _print_flag(struct trace_seq *s, struct event *event, | 101 | static void _print_flag(struct trace_seq *s, struct event_format *event, |
102 | const char *name, const void *data, | 102 | const char *name, const void *data, |
103 | const struct value_name *names, int n_names) | 103 | const struct value_name *names, int n_names) |
104 | { | 104 | { |
@@ -146,7 +146,7 @@ static void _print_flag(struct trace_seq *s, struct event *event, | |||
146 | #define SP() trace_seq_putc(s, ' ') | 146 | #define SP() trace_seq_putc(s, ' ') |
147 | 147 | ||
148 | static int drv_bss_info_changed(struct trace_seq *s, void *data, int size, | 148 | static int drv_bss_info_changed(struct trace_seq *s, void *data, int size, |
149 | struct event *event, int cpu, | 149 | struct event_format *event, int cpu, |
150 | unsigned long long nsecs) | 150 | unsigned long long nsecs) |
151 | { | 151 | { |
152 | print_string(s, event, "wiphy_name", data); | 152 | print_string(s, event, "wiphy_name", data); |
@@ -173,7 +173,7 @@ static int drv_bss_info_changed(struct trace_seq *s, void *data, int size, | |||
173 | } | 173 | } |
174 | 174 | ||
175 | static int drv_config(struct trace_seq *s, void *data, | 175 | static int drv_config(struct trace_seq *s, void *data, |
176 | int size, struct event *event, int cpu, | 176 | int size, struct event_format *event, int cpu, |
177 | unsigned long long nsecs) | 177 | unsigned long long nsecs) |
178 | { | 178 | { |
179 | print_string(s, event, "wiphy_name", data); | 179 | print_string(s, event, "wiphy_name", data); |