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

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

Merge "DnsResolver/res_send.cpp - fixes bugprone-argument-comment warning" am: 38dc74e4 

Change-Id: I7122f9b3378624b612e49537ccee7d2aa8eacec8
parents f8725cbd 38dc74e4

res_send.cpp

+2 −2
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ retry: 
    else

        timeout = evConsTime(0L, 0L);

    struct pollfd fds = {.fd = sock, .events = events};

    int n = ppoll(&fds, 1, &timeout, /*sigmask=*/NULL);

    int n = ppoll(&fds, 1, &timeout, /*__mask=*/NULL);

    if (n == 0) {

        LOG(INFO) << __func__ << ": " << sock << " retrying_poll timeout";

        errno = ETIMEDOUT;
@@ -905,7 +905,7 @@ static Result<std::vector<int>> udpRetryingPoll(res_state statp, const timespec* 
        timespec timeout = (evCmpTime(*finish, start_time) > 0) ? evSubTime(*finish, start_time)

                                                                : evConsTime(0L, 0L);

        std::vector<pollfd> fdset = extractUdpFdset(statp);

        const int n = ppoll(fdset.data(), fdset.size(), &timeout, /*sigmask=*/nullptr);

        const int n = ppoll(fdset.data(), fdset.size(), &timeout, /*__mask=*/nullptr);

        if (n <= 0) {

            if (errno == EINTR && n < 0) continue;

            if (n == 0) errno = ETIMEDOUT;