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

Commit 20a4822b authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "recvfrom takes a non-const pointer." am: 96660b37 am: 2f4c6e3d am: c41a11a0 

am: 59d4a4dd

Change-Id: I6b762f35f7f9bc28e893a058d0c87056786aae2d
parents 36a50e7b 59d4a4dd

libs/common_time/common_time_server.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -615,12 +615,11 @@ bool CommonTimeServer::handlePacket() { 




    ssize_t recvBytes = recvfrom(

    ssize_t recvBytes = recvfrom(

            mSocket, buf, sizeof(buf), 0,

            mSocket, buf, sizeof(buf), 0,

            reinterpret_cast<const sockaddr *>(&srcAddr), &srcAddrLen);

            reinterpret_cast<sockaddr *>(&srcAddr), &srcAddrLen);





    if (recvBytes < 0) {

    if (recvBytes < 0) {

        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG,

        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG, "recvfrom failed (%s)",

                       "recvfrom failed (res %d, errno %d)",

                       strerror(errno));

                       recvBytes, errno);

        return false;

        return false;

    }

    }