Changes in libfdproto/fifo.c [1093:44f3e48dfe27:1104:757df62cadb6] in freeDiameter

File:

• libfdproto/fifo.c (modified) (7 diffs)

libfdproto/fifo.c

@@ -412 +412 @@
         CHECK_MALLOC_DO(  new = malloc (sizeof (struct fifo_item)) , {
                         pthread_mutex_unlock( &queue->mtx );
+                        return ENOMEM;
                 } );
         
@@ -470 +471 @@
         ASSERT( ! FD_IS_LIST_EMPTY(&queue->list) );
         
-        fi = (struct fifo_item *)queue->list.next;
+        fi = (struct fifo_item *)(queue->list.next);
+        ret = fi->item.o;
         fd_list_unlink(&fi->item);
         queue->count--;
         queue->total_items++;
-        ret = fi->item.o;
         
         /* Update the timings */
@@ -578 +579 @@
 static int fifo_tget ( struct fifo * queue, void ** item, int istimed, const struct timespec *abstime)
 {
-        int timedout = 0;
         int call_cb = 0;
+        int ret = 0;
         
         /* Check the parameters */
@@ -598 +599 @@
                 return EPIPE;
         }
-                
+        
         if (queue->count > 0) {
                 /* There are items in the queue, so pick the first one */
@@ -604 +605 @@
                 call_cb = test_l_cb(queue);
         } else {
-                int ret = 0;
                 /* We have to wait for a new item */
                 queue->thrs++ ;
@@ -618 +618 @@
                         goto awaken;  /* test for spurious wake-ups */
                 
-                if (istimed && (ret == ETIMEDOUT)) {
-                        timedout = 1;
-                } else {
-                        /* Unexpected error condition (means we need to debug) */
-                        ASSERT( ret == 0 /* never true */ );
-                }
+                /* otherwise (ETIMEDOUT / other error) just continue */
         }
         
@@ -634 +629 @@
         
         /* Done */
-        return timedout ? ETIMEDOUT : 0;
+        return ret;
 }