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

Commit 40887d76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fix -Wunreachable-code-loop-increment" am: 10214508 am: b12d1520... 

Merge "fix -Wunreachable-code-loop-increment" am: 10214508 am: b12d1520 am: be0ea7ff am: 231dd2c3 am: cb7c6c71

Change-Id: I155e67c57c4d127655c6807b010745a7b534cf38
parents e6b7f170 cb7c6c71

tests/resolv_test_utils.cpp

+6 −8
Original line number Original line Diff line number Diff line
@@ -35,15 +35,13 @@ std::string ToString(const hostent* he) { 




std::string ToString(const addrinfo* ai) {

std::string ToString(const addrinfo* ai) {

    if (!ai) return "<null>";

    if (!ai) return "<null>";

    for (const auto* aip = ai; aip != nullptr; aip = aip->ai_next) {



    char host[NI_MAXHOST];

    char host[NI_MAXHOST];

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

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

                         NI_NUMERICHOST);

                         NI_NUMERICHOST);

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

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

    return host;

    return host;

}

}

    return "<invalid>";

}





std::string ToString(const ScopedAddrinfo& ai) {

std::string ToString(const ScopedAddrinfo& ai) {

    return ToString(ai.get());

    return ToString(ai.get());