From: <ag...@us...> - 2012-09-10 16:25:53
|
Revision: 2169 http://nagios.svn.sourceforge.net/nagios/?rev=2169&view=rev Author: ageric Date: 2012-09-10 16:25:44 +0000 (Mon, 10 Sep 2012) Log Message: ----------- Fix adding timeranges to timeperiods Previously we tried to be clever and skip the first timeperiod entry when we knew we couldn't break out of the loop early, but that failed pretty hard when multiple timeranges were given in sorted order, since we never even entered the loop in such cases. This patch corrects it and makes sure we run the loop at least once for every non-first timerange we add. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/common/objects.c Modified: nagioscore/trunk/common/objects.c =================================================================== --- nagioscore/trunk/common/objects.c 2012-09-10 16:25:25 UTC (rev 2168) +++ nagioscore/trunk/common/objects.c 2012-09-10 16:25:44 UTC (rev 2169) @@ -318,8 +318,7 @@ return new_timerange; } - prev = period->days[day]; - for(tr = prev->next; tr; tr = tr->next) { + for(tr = period->days[day]; tr; tr = tr->next) { if(new_timerange->range_start < tr->range_start) { new_timerange->next = tr; prev->next = new_timerange; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |