commit fe40207bd321c8bc24b9b55e7bf67ac3a26ba956
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 27 18:52:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 27 18:52:40 2020 +0000
tree 2a20faf335f5ccfbeab37e3534042803f9d638c3
parent 56e61a3f5ccd50740f36662d9a47ef080237f4d7
parent f9f02fde9614983d77101c1adbd29443499bf57f

Merge "identity/Util: Fix file write check" am: 61e8fb9442 am: 2f5ce9939d am: f9f02fde96

Change-Id: I53d2f39d0792c53cdbbad59b05457218a877d0b8

identity/Util.cpp

diff --git a/identity/Util.cpp b/identity/Util.cpp
index c397913..70e7105 100644
--- a/identity/Util.cpp
+++ b/identity/Util.cpp
@@ -60,7 +60,7 @@
     uint8_t* p = data.data();
     size_t remaining = data.size();
     while (remaining > 0) {
-        size_t numRead = TEMP_FAILURE_RETRY(read(fd, p, remaining));
+        ssize_t numRead = TEMP_FAILURE_RETRY(read(fd, p, remaining));
         if (numRead <= 0) {
             PLOG(ERROR) << "Failed reading from '" << path << "'";
             close(fd);
@@ -94,7 +94,7 @@
     const uint8_t* p = data.data();
     size_t remaining = data.size();
     while (remaining > 0) {
-        size_t numWritten = TEMP_FAILURE_RETRY(write(fd, p, remaining));
+        ssize_t numWritten = TEMP_FAILURE_RETRY(write(fd, p, remaining));
         if (numWritten <= 0) {
             PLOG(ERROR) << "Failed writing into temp file for '" << path << "'";
             close(fd);