Browse Source

[1198] a trivial cleanup: folded multiple lines into one when they were
sufficiently short.

JINMEI Tatuya 13 years ago
parent
commit
b77f5d1f89
1 changed files with 6 additions and 11 deletions
  1. 6 11
      src/lib/datasrc/database.cc

+ 6 - 11
src/lib/datasrc/database.cc

@@ -542,8 +542,7 @@ DatabaseClient::Finder::findWildcardMatch(
                 } else {
                 } else {
                     // NXRRSET case in the wildcard
                     // NXRRSET case in the wildcard
                     result_status = WILDCARD_NXRRSET;
                     result_status = WILDCARD_NXRRSET;
-                    if (dnssec_data &&
-                        nci != found.second.end()) {
+                    if (dnssec_data && nci != found.second.end()) {
                         // User wants a proof the wildcard doesn't contain it
                         // User wants a proof the wildcard doesn't contain it
                         //
                         //
                         // However, we need to get the RRset in the name of the
                         // However, we need to get the RRset in the name of the
@@ -555,10 +554,8 @@ DatabaseClient::Finder::findWildcardMatch(
                     }
                     }
                 }
                 }
 
 
-                LOG_DEBUG(logger, DBG_TRACE_DETAILED,
-                          DATASRC_DATABASE_WILDCARD).
-                    arg(accessor_->getDBName()).arg(wildcard).
-                    arg(name);
+                LOG_DEBUG(logger, DBG_TRACE_DETAILED,DATASRC_DATABASE_WILDCARD).
+                    arg(accessor_->getDBName()).arg(wildcard).arg(name);
             } else {
             } else {
                 LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                 LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                           DATASRC_DATABASE_WILDCARD_CANCEL_SUB).
                           DATASRC_DATABASE_WILDCARD_CANCEL_SUB).
@@ -571,8 +568,7 @@ DatabaseClient::Finder::findWildcardMatch(
             records_found = true;
             records_found = true;
             LOG_DEBUG(logger, DBG_TRACE_DETAILED,
             LOG_DEBUG(logger, DBG_TRACE_DETAILED,
                       DATASRC_DATABASE_WILDCARD_EMPTY).
                       DATASRC_DATABASE_WILDCARD_EMPTY).
-                arg(accessor_->getDBName()).arg(wildcard).
-                arg(name);
+                arg(accessor_->getDBName()).arg(wildcard).arg(name);
             if (dnssec_data) {
             if (dnssec_data) {
                 result_rrset = findNSECCover(Name(wildcard));
                 result_rrset = findNSECCover(Name(wildcard));
                 if (result_rrset) {
                 if (result_rrset) {
@@ -726,9 +722,8 @@ DatabaseClient::Finder::find(const isc::dns::Name& name,
             }
             }
         }
         }
     } else {
     } else {
-        logger.debug(DBG_TRACE_DETAILED,
-                     DATASRC_DATABASE_FOUND_RRSET)
-                    .arg(accessor_->getDBName()).arg(*result_rrset);
+        logger.debug(DBG_TRACE_DETAILED, DATASRC_DATABASE_FOUND_RRSET)
+            .arg(accessor_->getDBName()).arg(*result_rrset);
     }
     }
     return (FindResult(result_status, result_rrset));
     return (FindResult(result_status, result_rrset));
 }
 }