From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 3 Jun 2022 09:14:41 +0000 (+0200)
Subject: Multiple toString() calls -> once call.
X-Git-Tag: rec-4.8.0-alpha1~56^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36b69eab47cb54415c62aeae9473d89edbbbb386;p=thirdparty%2Fpdns.git

Multiple toString() calls -> once call.
---

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index dd49293e41..a788eeadd1 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -184,13 +184,14 @@ static void doCreateZone(const Json document)
     throw ApiException("Config Option \"api-config-dir\" must be set");
   }
 
-  DNSName zonename = apiNameToDNSName(stringFromJson(document, "name"));
-  apiCheckNameAllowedCharacters(zonename.toString());
+  const DNSName zone = apiNameToDNSName(stringFromJson(document, "name"));
+  const string zonename = zone.toString();
+  apiCheckNameAllowedCharacters(zonename);
 
   string singleIPTarget = document["single_target_ip"].string_value();
   string kind = toUpper(stringFromJson(document, "kind"));
   bool rd = boolFromJson(document, "recursion_desired");
-  string confbasename = "zone-" + apiZoneNameToId(zonename);
+  string confbasename = "zone-" + apiZoneNameToId(zone);
 
   if (kind == "NATIVE") {
     if (rd)
@@ -212,14 +213,14 @@ static void doCreateZone(const Json document)
       throw ApiException("Could not open '" + zonefilename + "' for writing: " + stringerror());
     }
     ofzone << "; Generated by pdns-recursor REST API, DO NOT EDIT" << endl;
-    ofzone << zonename.toString() << "\tIN\tSOA\tlocal.zone.\thostmaster." << zonename.toString() << " 1 1 1 1 1" << endl;
+    ofzone << zonename << "\tIN\tSOA\tlocal.zone.\thostmaster." << zonename << " 1 1 1 1 1" << endl;
     if (!singleIPTarget.empty()) {
-      ofzone << zonename.toString() << "\t3600\tIN\tA\t" << singleIPTarget << endl;
-      ofzone << "*." << zonename.toString() << "\t3600\tIN\tA\t" << singleIPTarget << endl;
+      ofzone << zonename << "\t3600\tIN\tA\t" << singleIPTarget << endl;
+      ofzone << "*." << zonename << "\t3600\tIN\tA\t" << singleIPTarget << endl;
     }
     ofzone.close();
 
-    apiWriteConfigFile(confbasename, "auth-zones+=" + zonename.toString() + "=" + zonefilename);
+    apiWriteConfigFile(confbasename, "auth-zones+=" + zonename + "=" + zonefilename);
   }
   else if (kind == "FORWARDED") {
     string serverlist;
@@ -243,10 +244,10 @@ static void doCreateZone(const Json document)
       throw ApiException("Need at least one upstream server when forwarding");
 
     if (rd) {
-      apiWriteConfigFile(confbasename, "forward-zones-recurse+=" + zonename.toString() + "=" + serverlist);
+      apiWriteConfigFile(confbasename, "forward-zones-recurse+=" + zonename + "=" + serverlist);
     }
     else {
-      apiWriteConfigFile(confbasename, "forward-zones+=" + zonename.toString() + "=" + serverlist);
+      apiWriteConfigFile(confbasename, "forward-zones+=" + zonename + "=" + serverlist);
     }
   }
   else {