From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 1 Apr 2013 09:51:15 +0000 (+0530)
Subject: [2387] Move string construction out of loop
X-Git-Tag: bind10-1.2.0beta1-release~481^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea8936112837ab22263edabe5c44f1f40fa0ef6a;p=thirdparty%2Fkea.git

[2387] Move string construction out of loop
---

diff --git a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
index b29ff45a38..5deaa699c7 100644
--- a/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec_bitmap.cc
@@ -86,6 +86,7 @@ buildBitmapsFromLexer(const char* const rrtype_name,
     memset(bitmap, 0, sizeof(bitmap));
 
     bool have_rrtypes = false;
+    std::string type_str;
     while (true) {
         const MasterToken& token =
             lexer.getNextToken(MasterToken::STRING, true);
@@ -97,7 +98,6 @@ buildBitmapsFromLexer(const char* const rrtype_name,
         // token is now assured to be of type STRING.
 
         have_rrtypes = true;
-        std::string type_str;
         token.getString(type_str);
         try {
             const int code = RRType(type_str).getCode();
diff --git a/src/lib/dns/rdata/generic/dnskey_48.cc b/src/lib/dns/rdata/generic/dnskey_48.cc
index 4400eb5425..e53f797114 100644
--- a/src/lib/dns/rdata/generic/dnskey_48.cc
+++ b/src/lib/dns/rdata/generic/dnskey_48.cc
@@ -161,6 +161,7 @@ DNSKEY::constructFromLexer(MasterLexer& lexer) {
     }
 
     std::string keydata_str;
+    std::string keydata_substr;
     while (true) {
         const MasterToken& token =
             lexer.getNextToken(MasterToken::STRING, true);
@@ -171,7 +172,6 @@ DNSKEY::constructFromLexer(MasterLexer& lexer) {
 
         // token is now assured to be of type STRING.
 
-        std::string keydata_substr;
         token.getString(keydata_substr);
         keydata_str.append(keydata_substr);
     }