From 707a5eaf0f976b94526ad1fa7640e576165611ca Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 14 Oct 2014 20:38:57 +0200
Subject: [PATCH] Simplify msg_queue_pull

---
 message_queue.c | 73 +++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/message_queue.c b/message_queue.c
index dcd6d69e9a..1a921c051c 100644
--- a/message_queue.c
+++ b/message_queue.c
@@ -124,10 +124,7 @@ void msg_queue_clear(msg_queue_t *queue)
 
 const char *msg_queue_pull(msg_queue_t *queue)
 {
-   struct queue_elem *front  = NULL;
-   struct queue_elem *last   = NULL;
-   struct queue_elem *parent = NULL;
-   struct queue_elem *child  = NULL;
+   struct queue_elem *front  = NULL, *last = NULL, *parent = NULL, *child = NULL;
    size_t tmp_ptr = 1;
     
    (void)parent;
@@ -142,48 +139,46 @@ const char *msg_queue_pull(msg_queue_t *queue)
    front->duration--;
    if (front->duration > 0)
       return front->msg;
-   else
+
+   free(queue->tmp_msg);
+   queue->tmp_msg = front->msg;
+   front->msg = NULL;
+
+   front = (struct queue_elem*)queue->elems[1];
+   last  = (struct queue_elem*)queue->elems[--queue->ptr];
+   queue->elems[1] = last;
+   free(front);
+
+   for (;;)
    {
-      free(queue->tmp_msg);
-      queue->tmp_msg = front->msg;
-      front->msg = NULL;
+      bool left = (tmp_ptr * 2 <= queue->ptr)
+         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2]);
+      bool right = (tmp_ptr * 2 + 1 <= queue->ptr)
+         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2 + 1]);
 
-      front = (struct queue_elem*)queue->elems[1];
-      last  = (struct queue_elem*)queue->elems[--queue->ptr];
-      queue->elems[1] = last;
-      free(front);
+      if (!left && !right)
+         break;
 
-      for (;;)
+      size_t switch_index = tmp_ptr;
+      if (left && !right)
+         switch_index <<= 1;
+      else if (right && !left)
+         switch_index += switch_index + 1;
+      else
       {
-         bool left = (tmp_ptr * 2 <= queue->ptr)
-            && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2]);
-         bool right = (tmp_ptr * 2 + 1 <= queue->ptr)
-            && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2 + 1]);
-
-         if (!left && !right)
-            break;
-
-         size_t switch_index = tmp_ptr;
-         if (left && !right)
+         if (queue->elems[tmp_ptr * 2]
+               >= queue->elems[tmp_ptr * 2 + 1])
             switch_index <<= 1;
-         else if (right && !left)
-            switch_index += switch_index + 1;
          else
-         {
-            if (queue->elems[tmp_ptr * 2]
-                  >= queue->elems[tmp_ptr * 2 + 1])
-               switch_index <<= 1;
-            else
-               switch_index += switch_index + 1;
-         }
-          
-         parent = (struct queue_elem*)queue->elems[tmp_ptr];
-         child  = (struct queue_elem*)queue->elems[switch_index];
-         queue->elems[tmp_ptr] = child;
-         queue->elems[switch_index] = parent;
-         tmp_ptr = switch_index;
+            switch_index += switch_index + 1;
       }
 
-      return queue->tmp_msg;
+      parent = (struct queue_elem*)queue->elems[tmp_ptr];
+      child  = (struct queue_elem*)queue->elems[switch_index];
+      queue->elems[tmp_ptr] = child;
+      queue->elems[switch_index] = parent;
+      tmp_ptr = switch_index;
    }
+
+   return queue->tmp_msg;
 }