Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00968cfc authored by donghongweng's avatar donghongweng Committed by Automerger Merge Worker
Browse files

Fix unqualified-std-cast-call compiler warning am: b6882611 am: f365ad34 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2188040



Change-Id: I14450b9ef234d64c82a17bdcf527e83d2a468cd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8613aae7 f365ad34

DnsProxyListener.cpp

+5 −5
Original line number Diff line number Diff line
@@ -681,9 +681,9 @@ DnsProxyListener::GetAddrInfoHandler::GetAddrInfoHandler(SocketClient* c, std::s 
                                                         std::unique_ptr<addrinfo> hints,

                                                         const android_net_context& netcontext)

    : Handler(c),

      mHost(move(host)),

      mService(move(service)),

      mHints(move(hints)),

      mHost(std::move(host)),

      mService(std::move(service)),

      mHints(std::move(hints)),

      mNetContext(netcontext) {}



static bool evaluate_domain_name(const android_net_context& netcontext, const char* host) {
@@ -954,7 +954,7 @@ int DnsProxyListener::GetAddrInfoCmd::runCommand(SocketClient* cli, int argc, ch 
        hints->ai_protocol = ai_protocol;

    }



    (new GetAddrInfoHandler(cli, name, service, move(hints), netcontext))->spawn();

    (new GetAddrInfoHandler(cli, name, service, std::move(hints), netcontext))->spawn();

    return 0;

}
@@ -1202,7 +1202,7 @@ int DnsProxyListener::GetHostByNameCmd::runCommand(SocketClient* cli, int argc, 
DnsProxyListener::GetHostByNameHandler::GetHostByNameHandler(SocketClient* c, std::string name,

                                                             int af,

                                                             const android_net_context& netcontext)

    : Handler(c), mName(move(name)), mAf(af), mNetContext(netcontext) {}

    : Handler(c), mName(std::move(name)), mAf(af), mNetContext(netcontext) {}



void DnsProxyListener::GetHostByNameHandler::doDns64Synthesis(int32_t* rv, hostent* hbuf, char* buf,

                                                              size_t buflen, struct hostent** hpp,

tests/dns_responder/dns_responder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ bool DNSResponder::fillRdata(const std::string& rdatastr, DNSRecord& record) { 
            LOG(ERROR) << "invalid name length";

            return false;

        }

        record.rdata = move(rdata);

        record.rdata = std::move(rdata);

    } else {

        LOG(ERROR) << "unhandled qtype " << dnstype2str(record.rtype);

        return false;

tests/dns_responder/dns_responder.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ class DNSResponder { 
        std::string name;

        unsigned type;



        QueryKey(std::string n, unsigned t) : name(move(n)), type(t) {}

        QueryKey(std::string n, unsigned t) : name(std::move(n)), type(t) {}

        bool operator==(const QueryKey& o) const { return name == o.name && type == o.type; }

        bool operator<(const QueryKey& o) const {

            if (name < o.name) return true;