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

Commit fdc0f89a authored by Bart Van Assche's avatar Bart Van Assche
Browse files

init: Convert a single-element array into a scalar 



Simplify PollIn() by converting a single-element array into a scalar. No
functionality is changed.

Change-Id: I3ef36b9c0daafeed3a92f90c7a7c4fe0654dd586
Signed-off-by: default avatarBart Van Assche <bvanassche@google.com>
parent 633b9ba2

init/property_service.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -320,13 +320,13 @@ class SocketConnection { 




  private:

  private:

    bool PollIn(uint32_t* timeout_ms) {

    bool PollIn(uint32_t* timeout_ms) {

        struct pollfd ufds[1];

        struct pollfd ufd = {

        ufds[0].fd = socket_;

                .fd = socket_,

        ufds[0].events = POLLIN;

                .events = POLLIN,

        ufds[0].revents = 0;

        };

        while (*timeout_ms > 0) {

        while (*timeout_ms > 0) {

            auto start_time = std::chrono::steady_clock::now();

            auto start_time = std::chrono::steady_clock::now();

            int nr = poll(ufds, 1, *timeout_ms);

            int nr = poll(&ufd, 1, *timeout_ms);

            auto now = std::chrono::steady_clock::now();

            auto now = std::chrono::steady_clock::now();

            auto time_elapsed =

            auto time_elapsed =

                std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);

                std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);