[svn] commit: r1311 - /trunk/src/lib/auth/data_source.cc

[BIND 10 source code commits]

Author: jinmei
Date: Thu Mar 11 00:30:00 2010
New Revision: 1311

Log:
cleanup: purged really unused function parameters

Modified:
    trunk/src/lib/auth/data_source.cc

Modified: trunk/src/lib/auth/data_source.cc
==============================================================================
--- trunk/src/lib/auth/data_source.cc (original)
+++ trunk/src/lib/auth/data_source.cc Thu Mar 11 00:30:00 2010
@@ -87,8 +87,7 @@
 // Synthesize a CNAME answer, for the benefit of clients that don't
 // understand DNAME
 static void
-synthesizeCname(Query& q, QueryTaskPtr task, RRsetPtr rrset, RRsetList& target)
-{
+synthesizeCname(QueryTaskPtr task, RRsetPtr rrset, RRsetList& target) {
     RdataIteratorPtr it = rrset->getRdataIterator();
 
     // More than one DNAME RR in the RRset is illegal, so we only have
@@ -187,8 +186,8 @@
 
 // Query for referrals (i.e., NS/DS or DNAME) at a given name
 static inline bool
-refQuery(const Name& name, Query& q, QueryTaskPtr task,
-         const DataSrc* ds, const Name* zonename, RRsetList& target)
+refQuery(const Name& name, Query& q, const DataSrc* ds, const Name* zonename,
+         RRsetList& target)
 {
     QueryTask newtask(name, q.qclass(), QueryTask::REF_QUERY);
 
@@ -218,7 +217,7 @@
         RRsetList ref;
         for (int i = diff; i > 1; --i) {
             const Name sub(task->qname.split(i - 1, nlen - i));
-            if (refQuery(sub, q, task, ds, zonename, ref)) {
+            if (refQuery(sub, q, ds, zonename, ref)) {
                 found = true;
                 break;
             }
@@ -237,7 +236,7 @@
                 RRsetList syn;
                 q.message().addRRset(Section::ANSWER(), r, q.wantDnssec());
                 q.message().setHeaderFlag(MessageFlag::AA());
-                synthesizeCname(q, task, r, syn);
+                synthesizeCname(task, r, syn);
                 if (syn.size() == 1) {
                     q.message().addRRset(Section::ANSWER(),
                                          syn[RRType::CNAME()],
@@ -461,7 +460,7 @@
             }
 
             RRsetList auth;
-            if (! refQuery(*zonename, q, task, ds, zonename, auth)) {
+            if (! refQuery(*zonename, q, ds, zonename, auth)) {
                 return (DataSrc::ERROR);
             }
 
@@ -574,8 +573,7 @@
                     // Add the NS records for the enclosing zone to
                     // the authority section.
                     RRsetList auth;
-                    if (! refQuery(*zonename, q, task, datasource,
-                                   zonename, auth)) {
+                    if (!refQuery(*zonename, q, datasource, zonename, auth)) {
                         m.setRcode(Rcode::SERVFAIL());
                         return;
                     }
@@ -617,8 +615,7 @@
             if (task->state == QueryTask::GETANSWER) {
                 RRsetList auth;
                 m.clearHeaderFlag(MessageFlag::AA());
-                if (!refQuery(task->qname, q, task, datasource, zonename,
-                              auth)) {
+                if (!refQuery(task->qname, q, datasource, zonename, auth)) {
                     m.setRcode(Rcode::SERVFAIL());
                     return;
                 }