Changeset 1059:a1d6e1980132 in freeDiameter

Timestamp:

May 10, 2013, 10:50:09 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix fifo_tget to propagate any error returned by the posix call

File:

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

libfdproto/fifo.c

@@ -489 +489 @@
 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 */
@@ -515 +515 @@
                 call_cb = test_l_cb(queue);
         } else {
-                int ret = 0;
                 /* We have to wait for a new item */
                 queue->thrs++ ;
@@ -529 +528 @@
                         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 */
         }
         
@@ -545 +539 @@
         
         /* Done */
-        return timedout ? ETIMEDOUT : 0;
+        return ret;
 }