]> granicus.if.org Git - pdns/commitdiff
Merge pull request #3029 from cmouse/cpp11-integer-conversions
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 22 Dec 2015 12:57:41 +0000 (13:57 +0100)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 22 Dec 2015 12:57:41 +0000 (13:57 +0100)
Some quality improvements

1  2 
pdns/dnsdist-lua.cc
pdns/dnsdist.cc
pdns/lua-recursor.cc
pdns/mbedtlssigners.cc
pdns/misc.cc
pdns/pdns_recursor.cc
pdns/syncres.cc
pdns/zone2sql.cc

Simple merge
diff --cc pdns/dnsdist.cc
index 2b9d17d2fa399265d26ad97a20290df879a8b0a8,8ebd3354c4d8cce4bec5691abf96132e16dad000..5777d81b00b1eaac386ebce3ce64fd948fb16ee7
@@@ -635,8 -573,9 +635,8 @@@ tr
        case DNSAction::Action::HeaderModify:
        dh->qr=true;
        break;
 -
        case DNSAction::Action::Delay:
-       delayMsec = atoi(ruleresult.c_str()); // sorry
+       delayMsec = static_cast<int>(pdns_stou(ruleresult)); // sorry
        break;
        case DNSAction::Action::Allow:
        case DNSAction::Action::None:
Simple merge
Simple merge
diff --cc pdns/misc.cc
Simple merge
Simple merge
diff --cc pdns/syncres.cc
Simple merge
Simple merge