From ecf7a7f16694840c6077e34fde2e084414bc881f Mon Sep 17 00:00:00 2001 From: Brad House Date: Sun, 19 Nov 2023 17:14:33 -0500 Subject: [PATCH] fix additional windows test warnings --- test/ares-test-parse-a.cc | 2 +- test/ares-test-parse-ptr.cc | 2 +- test/ares-test.cc | 12 ++++++------ test/dns-proto.cc | 32 ++++++++++++++++---------------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/test/ares-test-parse-a.cc b/test/ares-test-parse-a.cc index 43fd1bc7..b85a1723 100644 --- a/test/ares-test-parse-a.cc +++ b/test/ares-test-parse-a.cc @@ -121,7 +121,7 @@ TEST_F(LibraryTest, ParseMalformedAReply) { // Invalid RR-len. std::vector invalid_rrlen(data); invalid_rrlen[51] = 180; - EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(invalid_rrlen.data(), invalid_rrlen.size(), + EXPECT_EQ(ARES_EBADRESP, ares_parse_a_reply(invalid_rrlen.data(), (int)invalid_rrlen.size(), &host, info, &count)); // Truncate mid-question. diff --git a/test/ares-test-parse-ptr.cc b/test/ares-test-parse-ptr.cc index 80731683..e6fc96cd 100644 --- a/test/ares-test-parse-ptr.cc +++ b/test/ares-test-parse-ptr.cc @@ -69,7 +69,7 @@ struct DNSMalformedCnameRR : public DNSCnameRR { std::vector data = DNSRR::data(); std::vector encname = EncodeString(other_); encname[0] = encname[0] + 63; // invalid label length - int len = encname.size(); + int len = (int)encname.size(); PushInt16(&data, len); data.insert(data.end(), encname.begin(), encname.end()); return data; diff --git a/test/ares-test.cc b/test/ares-test.cc index 54464f6e..563aa690 100644 --- a/test/ares-test.cc +++ b/test/ares-test.cc @@ -79,8 +79,8 @@ unsigned long long LibraryTest::fails_ = 0; std::map LibraryTest::size_fails_; void ProcessWork(ares_channel_t *channel, - std::function()> get_extrafds, - std::function process_extra) { + std::function()> get_extrafds, + std::function process_extra) { int nfds, count; fd_set readers, writers; struct timeval tv; @@ -97,7 +97,7 @@ void ProcessWork(ares_channel_t *channel, for (ares_socket_t extrafd : extrafds) { FD_SET(extrafd, &readers); if (extrafd >= nfds) { - nfds = extrafd + 1; + nfds = (int)extrafd + 1; } } @@ -356,7 +356,7 @@ void MockServer::ProcessFD(ares_socket_t fd) { return; } if (fd == tcpfd_) { - int connfd = accept(tcpfd_, NULL, NULL); + ares_socket_t connfd = accept(tcpfd_, NULL, NULL); if (connfd < 0) { std::cerr << "Error accepting connection on fd " << fd << std::endl; } else { @@ -392,7 +392,7 @@ void MockServer::ProcessFD(ares_socket_t fd) { if (tcp_data_len_ - 2 < tcplen) break; - ProcessPacket(fd, &addr, addrlen, tcp_data_ + 2, tcplen); + ProcessPacket(fd, &addr, addrlen, tcp_data_ + 2, (int)tcplen); /* strip off processed data if connection not terminated */ if (tcp_data_ != NULL) { @@ -440,7 +440,7 @@ void MockServer::ProcessRequest(ares_socket_t fd, struct sockaddr_storage* addr, // Prefix with 2-byte length if TCP. if (fd != udpfd_) { - int len = reply.size(); + int len = (int)reply.size(); std::vector vlen = {(byte)((len & 0xFF00) >> 8), (byte)(len & 0xFF)}; reply.insert(reply.begin(), vlen.begin(), vlen.end()); // Also, don't bother with the destination address. diff --git a/test/dns-proto.cc b/test/dns-proto.cc index eb907c94..349a8a39 100644 --- a/test/dns-proto.cc +++ b/test/dns-proto.cc @@ -525,7 +525,7 @@ std::vector DNSRR::data() const { std::vector DNSSingleNameRR::data() const { std::vector data = DNSRR::data(); std::vector encname = EncodeString(other_); - size_t len = encname.size(); + int len = (int)encname.size(); PushInt16(&data, len); data.insert(data.end(), encname.begin(), encname.end()); return data; @@ -533,9 +533,9 @@ std::vector DNSSingleNameRR::data() const { std::vector DNSTxtRR::data() const { std::vector data = DNSRR::data(); - size_t len = 0; + int len = 0; for (const std::string& txt : txt_) { - len += (1 + txt.size()); + len += (1 + (int)txt.size()); } PushInt16(&data, len); for (const std::string& txt : txt_) { @@ -548,7 +548,7 @@ std::vector DNSTxtRR::data() const { std::vector DNSMxRR::data() const { std::vector data = DNSRR::data(); std::vector encname = EncodeString(other_); - size_t len = 2 + encname.size(); + int len = 2 + (int)encname.size(); PushInt16(&data, len); PushInt16(&data, pref_); data.insert(data.end(), encname.begin(), encname.end()); @@ -558,7 +558,7 @@ std::vector DNSMxRR::data() const { std::vector DNSSrvRR::data() const { std::vector data = DNSRR::data(); std::vector encname = EncodeString(target_); - size_t len = 6 + encname.size(); + int len = 6 + (int)encname.size(); PushInt16(&data, len); PushInt16(&data, prio_); PushInt16(&data, weight_); @@ -569,7 +569,7 @@ std::vector DNSSrvRR::data() const { std::vector DNSUriRR::data() const { std::vector data = DNSRR::data(); - size_t len = 4 + target_.size(); + int len = 4 + (int)target_.size(); PushInt16(&data, len); PushInt16(&data, prio_); PushInt16(&data, weight_); @@ -579,7 +579,7 @@ std::vector DNSUriRR::data() const { std::vector DNSAddressRR::data() const { std::vector data = DNSRR::data(); - size_t len = addr_.size(); + int len = (int)addr_.size(); PushInt16(&data, len); data.insert(data.end(), addr_.begin(), addr_.end()); return data; @@ -589,7 +589,7 @@ std::vector DNSSoaRR::data() const { std::vector data = DNSRR::data(); std::vector encname1 = EncodeString(nsname_); std::vector encname2 = EncodeString(rname_); - size_t len = encname1.size() + encname2.size() + 5*4; + int len = (int)encname1.size() + (int)encname2.size() + 5*4; PushInt16(&data, len); data.insert(data.end(), encname1.begin(), encname1.end()); data.insert(data.end(), encname2.begin(), encname2.end()); @@ -603,14 +603,14 @@ std::vector DNSSoaRR::data() const { std::vector DNSOptRR::data() const { std::vector data = DNSRR::data(); - size_t len = 0; + int len = 0; for (const DNSOption& opt : opts_) { - len += (4 + opt.data_.size()); + len += (4 + (int)opt.data_.size()); } PushInt16(&data, len); for (const DNSOption& opt : opts_) { PushInt16(&data, opt.code_); - PushInt16(&data, opt.data_.size()); + PushInt16(&data, (int)opt.data_.size()); data.insert(data.end(), opt.data_.begin(), opt.data_.end()); } return data; @@ -619,7 +619,7 @@ std::vector DNSOptRR::data() const { std::vector DNSNaptrRR::data() const { std::vector data = DNSRR::data(); std::vector encname = EncodeString(replacement_); - size_t len = (4 + 1 + flags_.size() + 1 + service_.size() + 1 + regexp_.size() + encname.size()); + int len = (4 + 1 + (int)flags_.size() + 1 + (int)service_.size() + 1 + (int)regexp_.size() + (int)encname.size()); PushInt16(&data, len); PushInt16(&data, order_); PushInt16(&data, pref_); @@ -651,13 +651,13 @@ std::vector DNSPacket::data() const { b |= (rcode_ & 0x0f); data.push_back(b); - size_t count = questions_.size(); + int count = (int)questions_.size(); PushInt16(&data, count); - count = answers_.size(); + count = (int)answers_.size(); PushInt16(&data, count); - count = auths_.size(); + count = (int)auths_.size(); PushInt16(&data, count); - count = adds_.size(); + count = (int)adds_.size(); PushInt16(&data, count); for (const std::unique_ptr& question : questions_) {