Merge "recvfrom takes a non-const pointer."

am: 96660b37a1 Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
2016-08-12 19:58:55 +00:00
parent b3d46b44a3 96660b37a1
commit 2f4c6e3d0d
1 changed files with 3 additions and 4 deletions
--- a/libs/common_time/common_time_server.cpp
+++ b/libs/common_time/common_time_server.cpp
@@ -615,12 +615,11 @@ bool CommonTimeServer::handlePacket() {

    ssize_t recvBytes = recvfrom(
            mSocket, buf, sizeof(buf), 0,
-            reinterpret_cast<const sockaddr *>(&srcAddr), &srcAddrLen);
+            reinterpret_cast<sockaddr *>(&srcAddr), &srcAddrLen);

    if (recvBytes < 0) {
-        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG,
-                       "recvfrom failed (res %d, errno %d)",
-                       recvBytes, errno);
+        mBadPktLog.log(ANDROID_LOG_ERROR, LOG_TAG, "recvfrom failed (%s)",
+                       strerror(errno));
        return false;
    }