From: Markus Elfring <[email protected]> Date: Sat, 6 Jul 2019 14:16:24 +0200
Avoid three function calls by using ternary operators instead of conditional statements. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <[email protected]> --- ipc/sem.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/ipc/sem.c b/ipc/sem.c index 7da4504bcc7c..56ea549ac270 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -2122,27 +2122,18 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops, int idx = array_index_nospec(sops->sem_num, sma->sem_nsems); curr = &sma->sems[idx]; - if (alter) { - if (sma->complex_count) { - list_add_tail(&queue.list, - &sma->pending_alter); - } else { - - list_add_tail(&queue.list, - &curr->pending_alter); - } - } else { - list_add_tail(&queue.list, &curr->pending_const); - } + list_add_tail(&queue.list, + alter + ? (sma->complex_count + ? &sma->pending_alter + : &curr->pending_alter) + : &curr->pending_const); } else { if (!sma->complex_count) merge_queues(sma); - if (alter) - list_add_tail(&queue.list, &sma->pending_alter); - else - list_add_tail(&queue.list, &sma->pending_const); - + list_add_tail(&queue.list, + alter ? &sma->pending_alter : &sma->pending_const); sma->complex_count++; } -- 2.22.0
