[svn] commit: r3247 - in /branches/trac232/src/lib/datasrc: data_source.cc data_source.h sqlite3_datasrc.cc sqlite3_datasrc.h

[BIND 10 source code commits]

Author: jelte
Date: Mon Oct 18 08:08:50 2010
New Revision: 3247

Log:
use explicit function pointers for callbacks in arguments

Modified:
    branches/trac232/src/lib/datasrc/data_source.cc
    branches/trac232/src/lib/datasrc/data_source.h
    branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc
    branches/trac232/src/lib/datasrc/sqlite3_datasrc.h

Modified: branches/trac232/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.cc (original)
+++ branches/trac232/src/lib/datasrc/data_source.cc Mon Oct 18 08:08:50 2010
@@ -1297,7 +1297,7 @@
 
 DataSrc::WriteResult
 DataSrc::replaceZone(DataSrcTransaction& transaction UNUSED_PARAM,
-                     isc::dns::RRsetPtr nextRRset(void*, void*) UNUSED_PARAM,
+                     isc::dns::RRsetPtr (*nextRRset)(void*, void*) UNUSED_PARAM,
                      void* arg1 UNUSED_PARAM, void* arg2 UNUSED_PARAM)
 {
     return (W_NOT_IMPLEMENTED);
@@ -1498,7 +1498,7 @@
 
 DataSrc::Result
 DataSrc::doIXFR(DataSrcTransaction& transaction UNUSED_PARAM,
-                isc::dns::RRsetPtr nextRRset(void*, void*),
+                isc::dns::RRsetPtr (*nextRRset)(void*, void*),
                 void* arg1, void* arg2)
 {
     if (transaction.getState() != DataSrcTransaction::RUNNING) {
@@ -1728,7 +1728,7 @@
 
 DataSrc::WriteResult
 MetaDataSrc::replaceZone(DataSrcTransaction& transaction UNUSED_PARAM,
-                         isc::dns::RRsetPtr nextRRset(void*, void*) UNUSED_PARAM,
+                         isc::dns::RRsetPtr (*nextRRset)(void*, void*) UNUSED_PARAM,
                          void* arg1 UNUSED_PARAM, void* arg2 UNUSED_PARAM)
 {
     return (W_NOT_IMPLEMENTED);

Modified: branches/trac232/src/lib/datasrc/data_source.h
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.h (original)
+++ branches/trac232/src/lib/datasrc/data_source.h Mon Oct 18 08:08:50 2010
@@ -479,7 +479,7 @@
     ///             nextRRset function (defaults to NULL)
     /// \return W_SUCCESS on success
     virtual WriteResult replaceZone(DataSrcTransaction& transaction,
-                                    isc::dns::RRsetPtr nextRRset(void*, void*),
+                                    isc::dns::RRsetPtr (*nextRRset)(void*, void*),
                                     void* arg1 = NULL, void* arg2 = NULL);
     //@}
 
@@ -636,7 +636,7 @@
                                        isc::dns::ConstRRsetPtr rrset);
     virtual WriteResult delZone(DataSrcTransaction&  transaction);
     virtual WriteResult replaceZone(DataSrcTransaction& transaction,
-                                    isc::dns::RRsetPtr nextRRset(void*, void*),
+                                    isc::dns::RRsetPtr (*nextRRset)(void*, void*),
                                     void* arg1 = NULL, void* arg2 = NULL);
     // end of writable data sources part
 private:

Modified: branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc (original)
+++ branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc Mon Oct 18 08:08:50 2010
@@ -1121,7 +1121,7 @@
 
 DataSrc::WriteResult
 Sqlite3DataSrc::replaceZone(DataSrcTransaction& transaction,
-                            isc::dns::RRsetPtr nextRRset(void*, void*),
+                            isc::dns::RRsetPtr (*nextRRset)(void*, void*),
                             void* arg1, void* arg2)
 {
     if (transaction.getState() != DataSrcTransaction::RUNNING) {

Modified: branches/trac232/src/lib/datasrc/sqlite3_datasrc.h
==============================================================================
--- branches/trac232/src/lib/datasrc/sqlite3_datasrc.h (original)
+++ branches/trac232/src/lib/datasrc/sqlite3_datasrc.h Mon Oct 18 08:08:50 2010
@@ -117,7 +117,7 @@
     WriteResult delRRset(DataSrcTransaction& transaction,
                                isc::dns::ConstRRsetPtr rrset);
     WriteResult replaceZone(DataSrcTransaction& transaction,
-                            isc::dns::RRsetPtr nextRRset(void*, void*),
+                            isc::dns::RRsetPtr (*nextRRset)(void*, void*),
                             void* arg1 = NULL, void* arg2 = NULL);
     WriteResult delZone(DataSrcTransaction& transaction);