Perm fix for misplaced OLSR_FOR_ALL_SOCKETS
authorSven-Ola Tuecke <sven-ola@gmx.de>
Fri, 19 Dec 2008 07:36:46 +0000 (08:36 +0100)
committerSven-Ola Tuecke <sven-ola@gmx.de>
Fri, 19 Dec 2008 07:36:46 +0000 (08:36 +0100)
looks like a sort of typo err included in 32be371fabea

.hgignore
src/scheduler.c

index 0301db2..37b2272 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -36,3 +36,7 @@ gui/win32/Shim/Release/
 .#*
 *.flc
 redhat/olsrd.spec
+files/index.html
+files/olsrd_8.html
+files/olsrd_conf_5.html
+files/olsr_switch_8.html
index 4790196..b78b551 100644 (file)
@@ -339,19 +339,19 @@ static void handle_fds(const unsigned long next_interval)
       if (flags != 0) {
        entry->process_immediate(entry->fd, entry->data, flags);
       }
-    }
+    } OLSR_FOR_ALL_SOCKETS_END(entry);
 
     /* calculate the next timeout */
     remaining = next_interval - (unsigned long)now_times;
     if ((long)remaining <= 0) {
       /* we are already over the interval */
-      return; /* Oops: break does not work because out-of-context OLSR_FOR_ALL_SOCKETS_END */
+      break;
     }
     /* we need an absolute time - milliseconds */
     remaining *= olsr_cnf->system_tick_divider;
     tvp.tv_sec = remaining / MSEC_PER_SEC;
     tvp.tv_usec = (remaining % MSEC_PER_SEC) * USEC_PER_MSEC;
-  } OLSR_FOR_ALL_SOCKETS_END(entry);
+  }
 }
 
 /**