From d84b3d9248595d60b71776670f7c7c3e4b059678 Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Sat, 19 Mar 2016 17:42:29 +0530 Subject: [PATCH] Miscellaneous cleanup --- minix/kernel/mqueue.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/minix/kernel/mqueue.c b/minix/kernel/mqueue.c index dfd2e0616..be84f5b99 100644 --- a/minix/kernel/mqueue.c +++ b/minix/kernel/mqueue.c @@ -157,14 +157,6 @@ size_t mq_receive(mqd_t mqdes, char *msg_ptr, unsigned int msg_prio, endpoint_t return 0; } -int find_max(int n1, int n2) -{ - if (n1 > n2) - return n1; - - return n2; -} - int message_index_with_highprio(int mqdes, endpoint_t dst) { int prio; @@ -179,9 +171,9 @@ int message_index_with_highprio(int mqdes, endpoint_t dst) if (max_prio == prio) { if (mq.msg[mqdes].msge[i].timestamp > mq.msg[mqdes].msge[index].timestamp) index = i; - } else if (max_prio < find_max(max_prio, prio)) { + } else if (max_prio < MAX(max_prio, prio)) { index = i; - max_prio = find_max(max_prio, prio); + max_prio = MAX(max_prio, prio); } } } @@ -202,7 +194,7 @@ int clean_message_queue(mqd_t mqdes) flag = 0; } - if (flag == 1) { + if (flag) { mq.msg[mqdes].msg_slot_empty[i] = EMPTY; mq.msg[mqdes].num_msgs--; }