Commit da3c9a448af7ab2beab62cfff42bdea9590d9bea
1 parent
13d4ff3eb3
Exists in
master
and in
20 other branches
perf trace: Simplify sys_exit return printing
Avoiding multiple sc->fmt != NULL tests. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-w28d1o3uslden0k57653kda7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff
tools/perf/builtin-trace.c
| ... | ... | @@ -464,16 +464,19 @@ |
| 464 | 464 | fprintf(trace->output, "]: %s()", sc->name); |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | - if (ret < 0 && sc->fmt && sc->fmt->errmsg) { | |
| 467 | + if (sc->fmt == NULL) { | |
| 468 | +signed_print: | |
| 469 | + fprintf(trace->output, ") = %d", ret); | |
| 470 | + } else if (ret < 0 && sc->fmt->errmsg) { | |
| 468 | 471 | char bf[256]; |
| 469 | 472 | const char *emsg = strerror_r(-ret, bf, sizeof(bf)), |
| 470 | 473 | *e = audit_errno_to_name(-ret); |
| 471 | 474 | |
| 472 | 475 | fprintf(trace->output, ") = -1 %s %s", e, emsg); |
| 473 | - } else if (ret == 0 && sc->fmt && sc->fmt->timeout) | |
| 476 | + } else if (ret == 0 && sc->fmt->timeout) | |
| 474 | 477 | fprintf(trace->output, ") = 0 Timeout"); |
| 475 | 478 | else |
| 476 | - fprintf(trace->output, ") = %d", ret); | |
| 479 | + goto signed_print; | |
| 477 | 480 | |
| 478 | 481 | fputc('\n', trace->output); |
| 479 | 482 | out: |