diff options
| author | Franck Bui-Huu <fbuihuu@gmail.com> | 2010-12-20 15:18:02 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-12-21 16:20:12 -0200 |
| commit | 44b81e929b0c00e703a31a3d634b668bb27eb1c8 (patch) | |
| tree | ad5cc15fcbe7389ea37a9af630f8cec218e1fae7 /tools | |
| parent | befe341468f4e61ecaf337a0237f2aab76817437 (diff) | |
| download | lwn-44b81e929b0c00e703a31a3d634b668bb27eb1c8.tar.gz lwn-44b81e929b0c00e703a31a3d634b668bb27eb1c8.zip | |
perf probe: Clean up redundant tests in show_line_range()
It also removes some superflous parentheses.
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1292854685-8230-4-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/util/probe-event.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 327604c1253f..b812f1412c3a 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -373,26 +373,30 @@ int show_line_range(struct line_range *lr, const char *module) return -errno; } /* Skip to starting line number */ - while (l < lr->start && ret >= 0) + while (l < lr->start) { ret = show_one_line(fp, l++, true, false); - if (ret < 0) - goto end; + if (ret < 0) + goto end; + } list_for_each_entry(ln, &lr->line_list, list) { - while (ln->line > l && ret >= 0) - ret = show_one_line(fp, (l++) - lr->offset, - false, false); - if (ret >= 0) - ret = show_one_line(fp, (l++) - lr->offset, - false, true); + for (; ln->line > l; l++) { + ret = show_one_line(fp, l - lr->offset, false, false); + if (ret < 0) + goto end; + } + ret = show_one_line(fp, l++ - lr->offset, false, true); if (ret < 0) goto end; } if (lr->end == INT_MAX) lr->end = l + NR_ADDITIONAL_LINES; - while (l <= lr->end && !feof(fp) && ret >= 0) - ret = show_one_line(fp, (l++) - lr->offset, false, false); + while (l <= lr->end && !feof(fp)) { + ret = show_one_line(fp, l++ - lr->offset, false, false); + if (ret < 0) + break; + } end: fclose(fp); return ret; |