From 2af3617b8df7e9a2e9c5a686ec07f33b93e5b65b Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 26 Sep 2015 14:47:56 +1000 Subject: [PATCH] pgrep:Remove the a?b:c for threads or no threads --- pgrep.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pgrep.c b/pgrep.c index b5b011a4..9e60977c 100644 --- a/pgrep.c +++ b/pgrep.c @@ -489,6 +489,7 @@ static struct el * select_procs (int *num) char cmdsearch[CMDSTRSIZE]; char cmdoutput[CMDSTRSIZE]; char *task_cmdline; + enum pids_reap_type which; preg = do_regcomp(); @@ -505,9 +506,11 @@ static struct el * select_procs (int *num) if (procps_pids_new(&info, 11, Items) < 0) xerrx(EXIT_FATAL, _("Unable to create pid info structure")); - if (procps_pids_read_open(info, - ((opt_threads && !i_am_pkill)? - PROCPS_REAP_THREADS_TOO:PROCPS_REAP_TASKS_ONLY)) < 0) + if (opt_threads && !i_am_pkill) + which = PROCPS_REAP_THREADS_TOO; + else + which = PROCPS_REAP_TASKS_ONLY; + if (procps_pids_read_open(info, which) < 0) xerrx(EXIT_FATAL, _("Unable to open pids information"));