Changeset 785

Timestamp:

04/28/06 11:39:49 (4 years ago)

Author:

ahu

Message:

replace ugly cache insertion/deleting code by nice alternative from Joaquin Lopez Munoz

Location:

trunk/pdns/pdns

Files:

• syncres.cc (modified) (2 diffs)
• syncres.hh (modified) (1 diff)

trunk/pdns/pdns/syncres.cc

@@ -685 +685 @@
           ne.d_qtype=QType(0);
           
-          pair<negcache_t::iterator, bool> res=s_negcache.insert(ne);
-          if(!res.second) {
-            s_negcache.erase(res.first);
-            s_negcache.insert(ne);
-          }
+          replacing_insert(s_negcache, ne);
           negindic=true;
         }
@@ -728 +724 @@
           ne.d_qtype=qtype;
           if(qtype.getCode()) {  // prevents us from blacking out a whole domain
-            pair<negcache_t::iterator, bool> res=s_negcache.insert(ne);
-            if(!res.second) {
-              s_negcache.erase(res.first);
-              s_negcache.insert(ne);
-            }
+            replacing_insert(s_negcache, ne);
           }
           negindic=true;

trunk/pdns/pdns/syncres.hh

@@ -412 +412 @@
 
 extern RecursorStats g_stats;
+
+
+template<typename Index>
+std::pair<typename Index::iterator,bool>
+replacing_insert(Index& i,const typename Index::value_type& x)
+{
+  std::pair<typename Index::iterator,bool> res=i.insert(x);
+  if(!res.second)res.second=i.replace(res.first,x);
+  return res;
+}
+
 #endif