Fixed unused variable.
authorBjoern Sikora <bjoern.sikora@intra2net.com>
Fri, 28 Jan 2011 17:06:03 +0000 (18:06 +0100)
committerBjoern Sikora <bjoern.sikora@intra2net.com>
Fri, 28 Jan 2011 17:07:49 +0000 (18:07 +0100)
Fixed missing iterator initialization.
Fixed get_last_update_time().

src/service.cpp
src/updater.cpp

index 2414adb..58c84cb 100644 (file)
@@ -326,8 +326,14 @@ void Service::set_last_update(const time_t current_time, const string& ip)
  */
 time_t Service::get_last_update_time( )
 {
-    std::map<time_t,std::string>::reverse_iterator r_iter = LastUpdates.rbegin();
-    return r_iter->first;
+    time_t last_update = 0;
+    if ( !LastUpdates.empty() )
+    {
+        std::map<time_t,std::string>::reverse_iterator r_iter = LastUpdates.rbegin();
+        if ( r_iter != LastUpdates.rend() )
+            last_update = r_iter->first;
+    }
+    return last_update;
 }
 
 
index 58648f6..2922cb7 100644 (file)
@@ -251,10 +251,9 @@ void Updater::update_services(bool changed_to_online) const
         if ( last_updates.size() > 0 )
         {
             bool ip_burnt = true;
-            string ip_next_to_last_update;
             int max_equal_updates_in_succession = service->get_max_equal_updates_in_succession();
             int i = 0;
-            for ( std::map<time_t,std::string>::reverse_iterator r_iter; (r_iter != last_updates.rend()) && (i < max_equal_updates_in_succession); r_iter++ )
+            for ( std::map<time_t,std::string>::reverse_iterator r_iter = last_updates.rbegin(); (r_iter != last_updates.rend()) && (i < max_equal_updates_in_succession); r_iter++ )
             {
                 if ( i == 0 )
                     lastupdated = r_iter->first;