From 9efea10a01eb1a56de1e5559efca5a2b5f9beb45 Mon Sep 17 00:00:00 2001 From: Bert Hubert Date: Wed, 3 Oct 2012 13:14:53 +0000 Subject: [PATCH] speedup from Mark Zealey for fillSOAData, ticket 584, thanks! git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2730 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- pdns/dns.cc | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/pdns/dns.cc b/pdns/dns.cc index 83f0e14c8..4b1260873 100644 --- a/pdns/dns.cc +++ b/pdns/dns.cc @@ -133,12 +133,6 @@ void fillSOAData(const string &content, SOAData &data) // fill out data with some plausible defaults: // 10800 3600 604800 3600 - data.serial=0; - data.refresh=::arg().asNum("soa-refresh-default"); - data.retry=::arg().asNum("soa-retry-default"); - data.expire=::arg().asNum("soa-expire-default"); - data.default_ttl=::arg().asNum("soa-minimum-ttl"); - vectorparts; stringtok(parts,content); int pleft=parts.size(); @@ -151,21 +145,19 @@ void fillSOAData(const string &content, SOAData &data) if(pleft>1) data.hostmaster=attodot(parts[1]); // ahu@ds9a.nl -> ahu.ds9a.nl, piet.puk@ds9a.nl -> piet\.puk.ds9a.nl - if(pleft>2) - data.serial=strtoul(parts[2].c_str(), NULL, 10); - - if(pleft>3) - data.refresh=atoi(parts[3].c_str()); + data.serial = pleft > 2 ? strtoul(parts[2].c_str(), NULL, 10) : 0; - if(pleft>4) - data.retry=atoi(parts[4].c_str()); + data.refresh = pleft > 3 ? atoi(parts[3].c_str()) + : ::arg().asNum("soa-refresh-default"); - if(pleft>5) - data.expire=atoi(parts[5].c_str()); + data.retry = pleft > 4 ? atoi(parts[4].c_str()) + : ::arg().asNum("soa-retry-default"); - if(pleft>6) - data.default_ttl=atoi(parts[6].c_str()); + data.expire = pleft > 5 ? atoi(parts[5].c_str()) + : ::arg().asNum("soa-expire-default"); + data.default_ttl = pleft > 6 ?atoi(parts[6].c_str()) + : ::arg().asNum("soa-minimum-ttl"); } string serializeSOAData(const SOAData &d) -- 2.49.0