M src/ClockTool.cc → src/ClockTool.cc

@@ -72,9 +72,10 @@ uint64_t calcNextTimeout(const std::string& fmt_string) {
 
     if (showSeconds(fmt_string)) { // microseconds till next full second
         return FbTk::FbTime::remainingNext(FbTk::FbTime::IN_SECONDS);
-    } else { // microseconds until next full minute
-        return FbTk::FbTime::remainingNext(60L * FbTk::FbTime::IN_SECONDS);
-    }
+    } 
+
+    // microseconds until next full minute
+    return FbTk::FbTime::remainingNext(60L * FbTk::FbTime::IN_SECONDS);
 }
 
 

M src/FbTk/Timer.cc → src/FbTk/Timer.cc

@@ -170,8 +170,7 @@ bool overdue = false;
     uint64_t now = FbTime::now();
     uint64_t end_time;
 
-    // see, if the first timer in the
-    // list is overdue
+    // search for overdue timers
     if (!s_timerlist.empty()) {
 
         Timer* timer = *s_timerlist.begin();
@@ -200,8 +199,7 @@ now = FbTime::now();
     for (it = s_timerlist.begin(); it != s_timerlist.end(); ) {
 
         // t->fireTimeout() might add timers to the list
-        // this invalidates 'it'. thus we store the current
-        // item here
+        // this invalidates 'it'. thus we store the current timer
         Timer* t = *it;
         if (now < t->getEndTime()) {
             break;