Skip to content

Commit

Permalink
clang-tidy: use std::min/max
Browse files Browse the repository at this point in the history
Found with readability-use-std-min-max

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
neheb committed Dec 11, 2024
1 parent 5089e2c commit d641465
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
4 changes: 2 additions & 2 deletions pdns/dnspacket.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "config.h"
#endif
#include "utility.hh"
#include <algorithm>
#include <cstdio>
#include <cstdlib>
#include <sys/types.h>
Expand Down Expand Up @@ -245,8 +246,7 @@ unsigned int DNSPacket::getMinTTL()
{
unsigned int minttl = UINT_MAX;
for(const DNSZoneRecord& rr : d_rrs) {
if (rr.dr.d_ttl < minttl)
minttl = rr.dr.d_ttl;
minttl = std::min(rr.dr.d_ttl, minttl);
}

return minttl;
Expand Down
5 changes: 2 additions & 3 deletions pdns/dnsparser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/
#include "dnsparser.hh"
#include "dnswriter.hh"
#include <algorithm>
#include <boost/algorithm/string.hpp>
#include <boost/format.hpp>

Expand Down Expand Up @@ -1009,9 +1010,7 @@ uint32_t getDNSPacketMinTTL(const char* packet, size_t length, bool* seenAuthSOA
}

const uint32_t ttl = dpm.get32BitInt();
if (result > ttl) {
result = ttl;
}
result = std::min(result, ttl);

dpm.skipRData();
}
Expand Down
20 changes: 8 additions & 12 deletions pdns/lua-record.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <algorithm>
#include <thread>
#include <future>
#include <boost/format.hpp>
Expand Down Expand Up @@ -1095,19 +1096,14 @@ static void setupLuaRecords(LuaContext& lua) // NOLINT(readability-function-cogn
*
* @example ifportup(443, { '1.2.3.4', '5.4.3.2' })"
*/
lua.writeFunction("ifportup", [](int port, const boost::variant<iplist_t, ipunitlist_t>& ips, const boost::optional<std::unordered_map<string,string>> options) {
if (port < 0) {
port = 0;
}
if (port > std::numeric_limits<uint16_t>::max()) {
port = std::numeric_limits<uint16_t>::max();
}
lua.writeFunction("ifportup", [](int port, const boost::variant<iplist_t, ipunitlist_t>& ips, const boost::optional<std::unordered_map<string, string>>& options) {
port = std::clamp(port, 0, static_cast<int>(std::numeric_limits<uint16_t>::max()));

auto checker = [](const ComboAddress& addr, const opts_t& opts) {
return g_up.isUp(addr, opts);
};
return genericIfUp(ips, options, checker, port);
});
auto checker = [](const ComboAddress& addr, const opts_t& opts) {
return g_up.isUp(addr, opts);
};
return genericIfUp(ips, options, checker, port);
});

lua.writeFunction("ifurlextup", [](const vector<pair<int, opts_t> >& ipurls, boost::optional<opts_t> options) {
vector<ComboAddress> candidates;
Expand Down
4 changes: 2 additions & 2 deletions pdns/sillyrecords.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "config.h"
#endif

#include <algorithm>
#include <boost/format.hpp>

#include "utility.hh"
Expand Down Expand Up @@ -46,8 +47,7 @@ static uint8_t precsize_aton(const char **strptr)
break;

mantissa = cmval / poweroften[exponent];
if (mantissa > 9)
mantissa = 9;
mantissa = std::min(mantissa, 9);

retval = (mantissa << 4) | exponent;

Expand Down

0 comments on commit d641465

Please sign in to comment.