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

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

Merge "Fix tidy warnings for r399163 Clang update." am: 9b879a6b am: 144414d2 am: 1f648647 

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

Change-Id: I4318dcbfb6782b05370b63bbcd1ac6a04d57361f
parents 3cba8b62 1f648647

res_comp.cpp

+3 −3
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ int dn_skipname(const uint8_t* ptr, const uint8_t* eom) { 
#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)



bool res_hnok(const char* dn) {

    int pch = PERIOD, ch = *dn++;

    char pch = PERIOD, ch = *dn++;



    while (ch != '\0') {

        int nch = *dn++;

        char nch = *dn++;



        if (periodchar(ch)) {

            ;
@@ -163,7 +163,7 @@ bool res_hnok(const char* dn) { 
 * recommendations.

 */

bool res_dnok(const char* dn) {

    int ch;

    char ch;



    while ((ch = *dn++) != '\0')

        if (!domainchar(ch)) return false;

tests/dns_responder/dns_tls_frontend.cpp

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ bool DnsTlsFrontend::startServer() { 


    // connect() always fails in the test DnsTlsSocketTest.SlowDestructor because of

    // no backend server. Don't check it.

    connect(backend_socket_.get(), backend_ai_res->ai_addr, backend_ai_res->ai_addrlen);

    static_cast<void>(

            connect(backend_socket_.get(), backend_ai_res->ai_addr, backend_ai_res->ai_addrlen));



    // Set up eventfd socket.

    event_fd_.reset(eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC));