“!(pager || access(…))” is indeed pretty smart way to write
“!pager && access(…) == 0” but other than being clever it gives
no advantages and merely confuses the reader who needs to wonder
what is actually going on.
As such, replace the checks with much cleaner ones.
Also, while at it, merge the lest “!pager” test with the next
test that yields true after the “!pager” if's body is executed.
---
tools/perf/util/pager.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c
index 31ee02d..14da1b0 100644
--- a/tools/perf/util/pager.c
+++ b/tools/perf/util/pager.c
@@ -57,13 +57,11 @@ void setup_pager(void)
}
if (!pager)
pager = getenv("PAGER");
- if (!(pager || access("/usr/bin/pager", X_OK)))
+ if (!pager && access("/usr/bin/pager", X_OK) == 0)
pager = "/usr/bin/pager";
- if (!(pager || access("/usr/bin/less", X_OK)))
+ if (!pager && access("/usr/bin/less", X_OK) == 0)
pager = "/usr/bin/less";
- if (!pager)
- pager = "cat";
- if (!*pager || !strcmp(pager, "cat"))
+ if (!pager || !*pager || !strcmp(pager, "cat"))
return;
spawned_pager = 1; /* means we are emitting to terminal */
--
2.0.0.526.g5318336
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
