mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
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>
This commit is contained in:
parent
befe341468
commit
44b81e929b
1 changed files with 15 additions and 11 deletions
|
@ -373,26 +373,30 @@ int show_line_range(struct line_range *lr, const char *module)
|
||||||
return -errno;
|
return -errno;
|
||||||
}
|
}
|
||||||
/* Skip to starting line number */
|
/* Skip to starting line number */
|
||||||
while (l < lr->start && ret >= 0)
|
while (l < lr->start) {
|
||||||
ret = show_one_line(fp, l++, true, false);
|
ret = show_one_line(fp, l++, true, false);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto end;
|
goto end;
|
||||||
|
}
|
||||||
|
|
||||||
list_for_each_entry(ln, &lr->line_list, list) {
|
list_for_each_entry(ln, &lr->line_list, list) {
|
||||||
while (ln->line > l && ret >= 0)
|
for (; ln->line > l; l++) {
|
||||||
ret = show_one_line(fp, (l++) - lr->offset,
|
ret = show_one_line(fp, l - lr->offset, false, false);
|
||||||
false, false);
|
if (ret < 0)
|
||||||
if (ret >= 0)
|
goto end;
|
||||||
ret = show_one_line(fp, (l++) - lr->offset,
|
}
|
||||||
false, true);
|
ret = show_one_line(fp, l++ - lr->offset, false, true);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lr->end == INT_MAX)
|
if (lr->end == INT_MAX)
|
||||||
lr->end = l + NR_ADDITIONAL_LINES;
|
lr->end = l + NR_ADDITIONAL_LINES;
|
||||||
while (l <= lr->end && !feof(fp) && ret >= 0)
|
while (l <= lr->end && !feof(fp)) {
|
||||||
ret = show_one_line(fp, (l++) - lr->offset, false, false);
|
ret = show_one_line(fp, l++ - lr->offset, false, false);
|
||||||
|
if (ret < 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
end:
|
end:
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue