Parcourir la source

[2470] Revert "[2470] provide RR collator with issue callbacks"

This reverts commit 822fa31524fc37af1ffdd265f8554fb9d85471f1.
JINMEI Tatuya il y a 12 ans
Parent
commit
2a8f04d9e4
1 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 4 4
      src/lib/datasrc/memory/zone_data_loader.cc

+ 4 - 4
src/lib/datasrc/memory/zone_data_loader.cc

@@ -193,12 +193,12 @@ masterLoaderWrapper(const char* const filename, const Name& origin,
                     const RRClass& zone_class, LoadCallback callback)
 {
     bool load_ok = false;       // (we don't use it)
-    const MasterLoaderCallbacks issue_callbacks =
-        createMasterLoaderCallbacks(origin, zone_class, &load_ok);
-    dns::RRCollator collator(boost::bind(callback, _1), issue_callbacks);
+    dns::RRCollator collator(boost::bind(callback, _1));
 
     try {
-        dns::MasterLoader(filename, origin, zone_class, issue_callbacks,
+        dns::MasterLoader(filename, origin, zone_class,
+                          createMasterLoaderCallbacks(origin, zone_class,
+                                                      &load_ok),
                           collator.getCallback()).load();
         collator.flush();
     } catch (const dns::MasterLoaderError& e) {