[svn] commit: r3280 - /branches/trac374/src/lib/datasrc/data_source.cc

[BIND 10 source code commits]

Author: jelte
Date: Tue Oct 19 14:04:52 2010
New Revision: 3280

Log:
style fix

Modified:
    branches/trac374/src/lib/datasrc/data_source.cc

Modified: branches/trac374/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac374/src/lib/datasrc/data_source.cc (original)
+++ branches/trac374/src/lib/datasrc/data_source.cc Tue Oct 19 14:04:52 2010
@@ -1045,7 +1045,7 @@
 
             if (q.wantDnssec()) {
                 result = proveNX(q, task, zoneinfo, false);
-                if (result != DataSrc::SUCCESS) {
+                if (result != SUCCESS) {
                     m.setRcode(Rcode::SERVFAIL());
                     return;
                 }
@@ -1327,7 +1327,7 @@
 DataSrc::haveRRset(DataSrcTransaction& transaction UNUSED_PARAM,
                    ConstRRsetPtr rrset) {
     RRsetList rrset_list;
-    DataSrc::Result result;
+    Result result;
     uint32_t flags = 0;
 
     if (rrset->getClass() == RRClass::ANY() || rrset->getClass() == RRClass::NONE()) {
@@ -1337,7 +1337,7 @@
         result = findExactRRset(rrset->getName(), rrset->getClass(),
                                          rrset->getType(), rrset_list, flags, NULL);
     }
-    if (result != DataSrc::SUCCESS || rrset_list.size() == 0) {
+    if (result != SUCCESS || rrset_list.size() == 0) {
         return (false);
     }
     if (rrset->getRdataCount() > 0) {
@@ -1473,7 +1473,7 @@
     RRsetIterator* end = static_cast<RRsetIterator*>(arg2);
 
     if (cur == NULL || end == NULL || *cur == *end) {
-        return RRsetPtr();
+        return (RRsetPtr());
     } else {
         RRsetPtr result = **cur;
         (*cur)++;
@@ -1504,23 +1504,23 @@
     WriteResult result;
     
     if (transaction.getState() != DataSrcTransaction::RUNNING) {
-        return (DataSrc::W_ERROR);
+        return (W_ERROR);
     }
 
     RRsetPtr final_soa = nextRRset(arg1, arg2);
     if (!final_soa) {
-        return (DataSrc::W_ERROR);
+        return (W_ERROR);
     }
     RRsetPtr first_soa = nextRRset(arg1, arg2);
     if (!final_soa) {
-        return (DataSrc::W_ERROR);
+        return (W_ERROR);
     }
 
     RRsetPtr next_rrset, last_rrset;
 
     if (first_soa->getType() == RRType::SOA()) {
         if (!haveRRset(transaction, first_soa)) {
-            return (DataSrc::W_ERROR);
+            return (W_ERROR);
         }
     } else {
         // Not a SOA, then this must be an AXFR-type response
@@ -1535,7 +1535,7 @@
                 return (result);
             }
         }
-        return (DataSrc::W_SUCCESS);
+        return (W_SUCCESS);
     }
     bool deleting = true;
 
@@ -1558,7 +1558,7 @@
                         return (result);
                     }
                 } else {
-                    return (DataSrc::W_ERROR);
+                    return (W_ERROR);
                 }
             } else {
                 result = addRRset(transaction, next_rrset);
@@ -1578,9 +1578,9 @@
         if (result != W_SUCCESS) {
             return (result);
         }
-        return (DataSrc::W_SUCCESS);
+        return (W_SUCCESS);
     } else {
-        return (DataSrc::W_ERROR);
+        return (W_ERROR);
     }
     return (W_NOT_IMPLEMENTED);
 }
@@ -1590,23 +1590,23 @@
 DataSrc::doUpdate(DataSrcTransaction& transaction UNUSED_PARAM,
                          isc::dns::Message& msg UNUSED_PARAM) {
     if (msg.getOpcode() != isc::dns::Opcode::UPDATE()) {
-        return W_ERROR;
+        return (W_ERROR);
     }
 
     // hmz, zone already in transaction. should we do transaction here?
     // (and not as an argument) for now, simply check it
     if (msg.getRRCount(isc::dns::Section::QUESTION()) != 1) {
-        return W_ERROR;
+        return (W_ERROR);
     }
     QuestionPtr question = *(msg.beginQuestion());
     if (question->getName() != transaction.getZoneName()) {
-        return W_ERROR;
+        return (W_ERROR);
     }
     if (question->getType() != isc::dns::RRType::SOA()) {
-        return W_ERROR;
+        return (W_ERROR);
     }
     if (question->getClass() != transaction.getZoneClass()) {
-        return W_ERROR;
+        return (W_ERROR);
     }
 
     // check the prerequisites
@@ -1619,7 +1619,7 @@
         if (prereq_result != Rcode::NOERROR()) {
             msg.clear(Message::RENDER);
             msg.setRcode(prereq_result);
-            return W_ERROR;
+            return (W_ERROR);
         }
     }
 
@@ -1629,13 +1629,13 @@
         RRsetPtr cur_update = *it;
         Rcode result = updateProcessUpdate(transaction, cur_update);
         if (result != Rcode::NOERROR()) {
-            return W_ERROR;
+            return (W_ERROR);
         }
     }
 
     // do we need to do anything with additional?
     
-    return W_SUCCESS;
+    return (W_SUCCESS);
 }
 
 DataSrc::Result