diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-02-22 16:16:05 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-02-22 16:16:05 +0100 |
| commit | a4ae7f1d739cc011b5312a8bfba99971bce0e7c3 (patch) | |
| tree | 649c907667350b80e926e8f34d04d567a8fb34aa | |
| parent | 83ea2049fcd3a15071b5519624269266e31d9906 (diff) | |
| parent | a022d76e6a7c711954be5535e6308d0a470e232a (diff) | |
Merge pull request #2695 from mustrumr/fix-calendarspec-skip
calendarspec: fix find_next skipping times
| -rw-r--r-- | src/basic/calendarspec.c | 4 | ||||
| -rw-r--r-- | src/test/test-calendarspec.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/basic/calendarspec.c b/src/basic/calendarspec.c index 00fc39a499..2f40ba2b46 100644 --- a/src/basic/calendarspec.c +++ b/src/basic/calendarspec.c @@ -1029,7 +1029,7 @@ static int find_next(const CalendarSpec *spec, struct tm *tm, usec_t *usec) { r = find_matching_component(spec->hour, &c.tm_hour); if (r > 0) - c.tm_min = c.tm_sec = 0; + c.tm_min = c.tm_sec = tm_usec = 0; if (r < 0 || tm_out_of_bounds(&c, spec->utc)) { c.tm_mday ++; c.tm_hour = c.tm_min = c.tm_sec = tm_usec = 0; @@ -1038,7 +1038,7 @@ static int find_next(const CalendarSpec *spec, struct tm *tm, usec_t *usec) { r = find_matching_component(spec->minute, &c.tm_min); if (r > 0) - c.tm_sec = 0; + c.tm_sec = tm_usec = 0; if (r < 0 || tm_out_of_bounds(&c, spec->utc)) { c.tm_hour ++; c.tm_min = c.tm_sec = tm_usec = 0; diff --git a/src/test/test-calendarspec.c b/src/test/test-calendarspec.c index 8754cb3381..5a8c6cbfb6 100644 --- a/src/test/test-calendarspec.c +++ b/src/test/test-calendarspec.c @@ -137,6 +137,7 @@ int main(int argc, char* argv[]) { test_next("2015-11-13 09:11:23.42", "EET", 12345, 1447398683420000); test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683420000, 1447398685190000); test_next("2015-11-13 09:11:23.42/1.77", "EET", 1447398683419999, 1447398683420000); + test_next("Sun 16:00:00", "CET", 1456041600123456, 1456066800000000); assert_se(calendar_spec_from_string("test", &c) < 0); assert_se(calendar_spec_from_string("", &c) < 0); |