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

Commit 2feb3d94 authored by Ken Chen's avatar Ken Chen Committed by Automerger Merge Worker
Browse files

[Code Health] Fix misc-const-correctness lint am: d11adb06 am: 8f71f2d8 

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



Change-Id: Ibfba64fb3ad1ddf5046b65a4427608dc62c0a96b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c958592 8f71f2d8

DnsProxyListener.cpp

+2 −2
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ void logDnsQueryResult(const addrinfo* res) { 
        // getnameinfo.

        const sockaddr* ai_addr = ai->ai_addr;

        char ip_addr[INET6_ADDRSTRLEN];

        int ret = getnameinfo(ai_addr, ai->ai_addrlen, ip_addr, sizeof(ip_addr), nullptr, 0,

        const int ret = getnameinfo(ai_addr, ai->ai_addrlen, ip_addr, sizeof(ip_addr), nullptr, 0,

                                    NI_NUMERICHOST);

        if (!ret) {

            LOG(DEBUG) << __func__ << ": [" << i << "] " << ai->ai_flags << " " << ai->ai_family

hostent.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static const char NAT64_PAD[NS_IN6ADDRSZ - NS_INADDRSZ] = {}; 
    } while (0)



#define HENT_SCOPY(dst, src, ptr, len) do {  \

        size_t _len = strlen(src) + 1;       \

        const size_t _len = strlen(src) + 1; \

        HENT_COPY(dst, src, _len, ptr, len); \

    } while (0)

tests/resolv_test_utils.cpp

+4 −3
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ std::string ToString(const addrinfo* ai) { 


    const sockaddr* ai_addr = ai->ai_addr;

    char host[NI_MAXHOST];

    int rv = getnameinfo(ai_addr, ai->ai_addrlen, host, sizeof(host), nullptr, 0, NI_NUMERICHOST);

    const int rv =

            getnameinfo(ai_addr, ai->ai_addrlen, host, sizeof(host), nullptr, 0, NI_NUMERICHOST);

    if (rv != 0) return gai_strerror(rv);

    return host;

}
@@ -86,7 +87,7 @@ std::vector<std::string> ToStrings(const addrinfo* ai) { 
    for (const auto* aip = ai; aip != nullptr; aip = aip->ai_next) {

        const sockaddr* ai_addr = aip->ai_addr;

        char host[NI_MAXHOST];

        int rv = getnameinfo(ai_addr, aip->ai_addrlen, host, sizeof(host), nullptr, 0,

        const int rv = getnameinfo(ai_addr, aip->ai_addrlen, host, sizeof(host), nullptr, 0,

                                   NI_NUMERICHOST);

        if (rv != 0) {

            hosts.clear();