minor cosmetic
This commit is contained in:
parent
2f279e96b1
commit
e512c1becd
2 changed files with 6 additions and 7 deletions
|
@ -72,9 +72,10 @@ uint64_t calcNextTimeout(const std::string& fmt_string) {
|
||||||
|
|
||||||
if (showSeconds(fmt_string)) { // microseconds till next full second
|
if (showSeconds(fmt_string)) { // microseconds till next full second
|
||||||
return FbTk::FbTime::remainingNext(FbTk::FbTime::IN_SECONDS);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -170,8 +170,7 @@ void Timer::updateTimers(int fd) {
|
||||||
uint64_t now = FbTime::now();
|
uint64_t now = FbTime::now();
|
||||||
uint64_t end_time;
|
uint64_t end_time;
|
||||||
|
|
||||||
// see, if the first timer in the
|
// search for overdue timers
|
||||||
// list is overdue
|
|
||||||
if (!s_timerlist.empty()) {
|
if (!s_timerlist.empty()) {
|
||||||
|
|
||||||
Timer* timer = *s_timerlist.begin();
|
Timer* timer = *s_timerlist.begin();
|
||||||
|
@ -200,8 +199,7 @@ void Timer::updateTimers(int fd) {
|
||||||
for (it = s_timerlist.begin(); it != s_timerlist.end(); ) {
|
for (it = s_timerlist.begin(); it != s_timerlist.end(); ) {
|
||||||
|
|
||||||
// t->fireTimeout() might add timers to the list
|
// t->fireTimeout() might add timers to the list
|
||||||
// this invalidates 'it'. thus we store the current
|
// this invalidates 'it'. thus we store the current timer
|
||||||
// item here
|
|
||||||
Timer* t = *it;
|
Timer* t = *it;
|
||||||
if (now < t->getEndTime()) {
|
if (now < t->getEndTime()) {
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue