Parcourir la source

[1579] editorial: removed spaces at EOL; folded long lines, () after return.

JINMEI Tatuya il y a 13 ans
Parent
commit
dd8d9d4ab3
2 fichiers modifiés avec 14 ajouts et 14 suppressions
  1. 10 10
      src/lib/datasrc/database.cc
  2. 4 4
      src/lib/datasrc/tests/database_unittest.cc

+ 10 - 10
src/lib/datasrc/database.cc

@@ -911,8 +911,8 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
     // If the NSEC3PARAMETER type exists in the zonefile,NSEC3 is definitly used
     // in this zone signature.
     bool is_nsec3 = false;
-    const FoundRRsets nsec3_found = getRRsets(origin_.toText(), NSEC3PARAM_TYPES(),
-                                              false);
+    const FoundRRsets nsec3_found = getRRsets(origin_.toText(),
+                                              NSEC3PARAM_TYPES(), false);
     const FoundIterator nfi(nsec3_found.second.find(RRType::NSEC3PARAM()));
     if (nfi != nsec3_found.second.end()) {
         is_nsec3 = true;
@@ -921,7 +921,7 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
         // Something found at the domain name.  Look into it further to get
         // the final result.
         if (true == is_nsec3) {
-            const ZoneFinder::ResultContext result_context = 
+            const ZoneFinder::ResultContext result_context =
                 findOnNameResult(name, type, options, is_origin, found, NULL,
                                  target);
             if ((result_context.code & NXRRSET) ||
@@ -931,30 +931,30 @@ DatabaseClient::Finder::findInternal(const Name& name, const RRType& type,
                                                   (result_context.flags |
                                                    RESULT_NSEC3_SIGNED)));
             } else {
-                return result_context; 
+                return (result_context);
             }
         } else {
-            return (findOnNameResult(name, type, options, is_origin, found, NULL,
-                                     target));
+            return (findOnNameResult(name, type, options, is_origin, found,
+                                     NULL, target));
         }
     } else {
         // Did not find anything at all at the domain name, so check for
         // subdomains or wildcards.
         if (true == is_nsec3) {
             // NSEC3 is used for this zonefile
-            const ZoneFinder::ResultContext result_context = 
+            const ZoneFinder::ResultContext result_context =
                 findNoNameResult(name, type, options, dresult, target);
             if ((result_context.code & (NXRRSET | NXDOMAIN)) ||
                 (result_context.flags & RESULT_WILDCARD)){
                 // NXRRSET NXDOMAIN and wildcard should set RESULT_NSEC3_SIGNED
-                return (ZoneFinder::ResultContext(result_context.code, 
+                return (ZoneFinder::ResultContext(result_context.code,
                                                   result_context.rrset,
                                                   (result_context.flags |
                                                    RESULT_NSEC3_SIGNED)));
             } else {
-                return result_context;
+                return (result_context);
             }
-        } else { 
+        } else {
             return (findNoNameResult(name, type, options, dresult, target));
         }
     }

+ 4 - 4
src/lib/datasrc/tests/database_unittest.cc

@@ -2285,7 +2285,7 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) {
     // ZoneFinder::find() for negative cases should show whether the zone is
     // signed by NSEC or NSEC3,that is good for upper layer caller.
 
-    // First off, everything should be okay if no NSEC3PARAM rrset 
+    // First off, everything should be okay if no NSEC3PARAM rrset
     this->updater_ = this->client_->getUpdater(this->zname_, false);
     this->expected_rdatas_.clear();
     this->expected_sig_rdatas_.clear();
@@ -2320,10 +2320,10 @@ TYPED_TEST(DatabaseClientTest, dbNegativeCaseFind) {
                this->empty_rdatas_,
                ZoneFinder::RESULT_WILDCARD);
 
-    // Then,If NSEC3PARAM exists in zonefile,the flags of result should 
+    // Then,If NSEC3PARAM exists in zonefile,the flags of result should
     // contain RESULT_NSEC3_SIGNED flag when NXDOMAIN NXRRSET or wildcard
-    
-    // Add NSEC3PARAM RRSET to zonefile. It looks weird if zonefile only have 
+
+    // Add NSEC3PARAM RRSET to zonefile. It looks weird if zonefile only have
     // NSEC3PARM RRSET, but it is okay for unit test.
     this->rrset_.reset(new RRset(this->zname_, this->qclass_,
                                 isc::dns::RRType::NSEC3PARAM(),