From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 1 Apr 2013 09:49:59 +0000 (+0530)
Subject: [2387] Remove unnecessary checks
X-Git-Tag: bind10-1.2.0beta1-release~481^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e42c4c83835acbb17075759f9dd206dcff4a8d37;p=thirdparty%2Fkea.git

[2387] Remove unnecessary checks
---

diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
index 21556ab183..b29ff45a38 100644
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
@@ -94,10 +94,7 @@ buildBitmapsFromLexer(const char* const rrtype_name,
             break;
         }
 
-        if (token.getType() != MasterToken::STRING) {
-             isc_throw(InvalidRdataText,
-                       "Non-string token found when parsing key data");
-        }
+        // token is now assured to be of type STRING.
 
         have_rrtypes = true;
         std::string type_str;
diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
index bfe148a578..4400eb5425 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ b/src/lib/dns/rdata/generic/dnskey_48.cc
@@ -169,10 +169,7 @@ DNSKEY::constructFromLexer(MasterLexer& lexer) {
             break;
         }
 
-        if (token.getType() != MasterToken::STRING) {
-             isc_throw(InvalidRdataText,
-                       "Non-string token found when parsing key data");
-        }
+        // token is now assured to be of type STRING.
 
         std::string keydata_substr;
         token.getString(keydata_substr);