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>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 86568ed53ac4f2fc8b431a463849833dfb576bf5..9e23660d96eb09cf78a413816cdcafd83890a5a6 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -464,16 +464,19 @@ static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
                fprintf(trace->output, "]: %s()", sc->name);
        }
 
-       if (ret < 0 && sc->fmt && sc->fmt->errmsg) {
+       if (sc->fmt == NULL) {
+signed_print:
+               fprintf(trace->output, ") = %d", ret);
+       } else if (ret < 0 && sc->fmt->errmsg) {
                char bf[256];
                const char *emsg = strerror_r(-ret, bf, sizeof(bf)),
                           *e = audit_errno_to_name(-ret);
 
                fprintf(trace->output, ") = -1 %s %s", e, emsg);
-       } else if (ret == 0 && sc->fmt && sc->fmt->timeout)
+       } else if (ret == 0 && sc->fmt->timeout)
                fprintf(trace->output, ") = 0 Timeout");
        else
-               fprintf(trace->output, ") = %d", ret);
+               goto signed_print;
 
        fputc('\n', trace->output);
 out: