Changes in / [1103:d8591b1c56cd:1104:757df62cadb6] in freeDiameter

Files:

• libfdcore/p_psm.c (modified) (1 diff)
• libfdproto/fifo.c (modified) (4 diffs)

libfdcore/p_psm.c

@@ -336 +336 @@
                 peer->p_psm_timer.tv_sec += random() % 4;
                 peer->p_psm_timer.tv_nsec+= random() % 1000000000L;
-                if (peer->p_psm_timer.tv_nsec > 1000000000L) {
+                if (peer->p_psm_timer.tv_nsec >= 1000000000L) {
                         peer->p_psm_timer.tv_nsec -= 1000000000L;
                         peer->p_psm_timer.tv_sec ++;

libfdproto/fifo.c

@@ -579 +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 */
@@ -605 +605 @@
                 call_cb = test_l_cb(queue);
         } else {
-                int ret = 0;
                 /* We have to wait for a new item */
                 queue->thrs++ ;
@@ -619 +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 */
         }
         
@@ -635 +629 @@
         
         /* Done */
-        return timedout ? ETIMEDOUT : 0;
+        return ret;
 }