commit f809223ffb5688f055bdadb774d8affc1f302de9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 20 02:19:45 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 20 02:19:45 2020 +0000
tree 7971f5e72f5842a5b8712cd5709c33dc18f9a0ec
parent 3698ff1bd292c839dd7018d7c92c305da5beedbe
parent 7cf47025eef891def5ecd439d75ec1fe2fc96a25

Merge "dmuserd: Fix error checking" am: 7cf47025ee

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1506837

Change-Id: Ib88c59b3e93fb2d5c832ec074bed8223ec1c297e

fs_mgr/tools/dmuserd.cpp

diff --git a/fs_mgr/tools/dmuserd.cpp b/fs_mgr/tools/dmuserd.cpp
index 92f5878..e50a4a2 100644
--- a/fs_mgr/tools/dmuserd.cpp
+++ b/fs_mgr/tools/dmuserd.cpp
@@ -76,7 +76,7 @@
 
 static bool verbose = false;
 
-size_t write_all(int fd, void* buf, size_t len) {
+ssize_t write_all(int fd, void* buf, size_t len) {
     char* buf_c = (char*)buf;
     ssize_t total = 0;
     ssize_t once;
@@ -94,7 +94,7 @@
     return total;
 }
 
-size_t read_all(int fd, void* buf, size_t len) {
+ssize_t read_all(int fd, void* buf, size_t len) {
     char* buf_c = (char*)buf;
     ssize_t total = 0;
     ssize_t once;