Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools lib traceevent: Use local variable 'field'

Use local variable 'field' to reduce typing. It is needed by later patch
not to exceed 80 column.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1340757701-10711-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Namhyung Kim and committed by
Arnaldo Carvalho de Melo
b7008071 600da3cf

+11 -8
+11 -8
tools/lib/traceevent/event-parse.c
··· 3214 3214 { 3215 3215 struct pevent *pevent = event->pevent; 3216 3216 struct print_flag_sym *flag; 3217 + struct format_field *field; 3217 3218 unsigned long long val, fval; 3218 3219 unsigned long addr; 3219 3220 char *str; ··· 3229 3228 print_str_to_seq(s, format, len_arg, arg->atom.atom); 3230 3229 return; 3231 3230 case PRINT_FIELD: 3232 - if (!arg->field.field) { 3233 - arg->field.field = pevent_find_any_field(event, arg->field.name); 3234 - if (!arg->field.field) 3231 + field = arg->field.field; 3232 + if (!field) { 3233 + field = pevent_find_any_field(event, arg->field.name); 3234 + if (!field) 3235 3235 die("field %s not found", arg->field.name); 3236 + arg->field.field = field; 3236 3237 } 3237 3238 /* Zero sized fields, mean the rest of the data */ 3238 - len = arg->field.field->size ? : size - arg->field.field->offset; 3239 + len = field->size ? : size - field->offset; 3239 3240 3240 3241 /* 3241 3242 * Some events pass in pointers. If this is not an array 3242 3243 * and the size is the same as long_size, assume that it 3243 3244 * is a pointer. 3244 3245 */ 3245 - if (!(arg->field.field->flags & FIELD_IS_ARRAY) && 3246 - arg->field.field->size == pevent->long_size) { 3247 - addr = *(unsigned long *)(data + arg->field.field->offset); 3246 + if (!(field->flags & FIELD_IS_ARRAY) && 3247 + field->size == pevent->long_size) { 3248 + addr = *(unsigned long *)(data + field->offset); 3248 3249 trace_seq_printf(s, "%lx", addr); 3249 3250 break; 3250 3251 } 3251 3252 str = malloc_or_die(len + 1); 3252 - memcpy(str, data + arg->field.field->offset, len); 3253 + memcpy(str, data + field->offset, len); 3253 3254 str[len] = 0; 3254 3255 print_str_to_seq(s, format, len_arg, str); 3255 3256 free(str);