Merge branch 'fastpath' of ssh://git.bro-ids.org/bro into fastpath

This commit is contained in:
Robin Sommer 2012-07-20 06:58:33 -07:00
commit 450b49d14d

View file

@ -1112,9 +1112,9 @@ double calc_next_rotate(double current, double interval, double base)
time_t teatime = time_t(current); time_t teatime = time_t(current);
struct tm t; struct tm t;
t = *localtime_r(&teatime, &t); t = *gmtime_r(&teatime, &t);
t.tm_hour = t.tm_min = t.tm_sec = 0; t.tm_hour = t.tm_min = t.tm_sec = 0;
double startofday = mktime(&t); double startofday = timegm(&t);
if ( base < 0 ) if ( base < 0 )
// No base time given. To get nice timestamps, we round // No base time given. To get nice timestamps, we round