commit 61e8fb9442d65d2361a45449fae7bb605eabd800
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 27 18:01:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 18:01:34 2020 +0000
tree 0bddf6c7ece8e6be4afe8914cddabd92d5557f8c
parent 2d5b18b9b7914384f3a06d2bc8c4898af38e900b
parent c8966aa0dab4e14ef17cd9daef9b12b8cb6e87ce

Merge "identity/Util: Fix file write check"

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);