[2377] Small optimizations

diff --git a/src/lib/dns/master_loader.cc b/src/lib/dns/master_loader.cc
index c95113851413467540c2cfbbac0781b05be42206..f29da45130651e05f5b1d25585526ff45f7d6026 100644 (file)
--- a/src/lib/dns/master_loader.cc
+++ b/src/lib/dns/master_loader.cc
@@ -83,7 +83,8 @@ public:
 
     // Get a string token. Handle it as error if it is not string.
     const string getString() {
-        return (lexer_.getNextToken(MasterToken::QSTRING).getString());
+        lexer_.getNextToken(MasterToken::QSTRING).getString(string_token_);
+        return (string_token_);
     }
 
     bool loadIncremental(size_t count_limit);
@@ -98,6 +99,7 @@ private:
     const std::string master_file_;
     bool initialized_;
     bool ok_;
+    std::string string_token_;
 public:
     bool complete_;
 };
@@ -127,7 +129,7 @@ MasterLoader::MasterLoaderImpl::loadIncremental(size_t count_limit) {
             // Return the last token, as it was not empty
             lexer_.ungetToken();
 
-            const MasterToken::StringRegion
+            const MasterToken::StringRegion&
                 name_string(lexer_.getNextToken(MasterToken::QSTRING).
                             getStringRegion());
             // TODO $ handling