commit c7edf078f92c7ce083f8c243a79f8aecdfff4ac1
author Chih-Hung Hsieh <chh@google.com> Tue Oct 03 09:57:55 2017 -0700
committer Chih-Hung Hsieh <chh@google.com> Fri Oct 13 16:25:16 2017 -0700
tree d7816094d61913df8ee8c17e60763ccd050c4631
parent 26817938f6966928488e92de73359c3887006642

Use -Werror in frameworks/base

* Fix unused variable and return value warnings.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I890e65a20848d00559ba5a4f9691be1347b456af

tools/bit/util.cpp

diff --git a/tools/bit/util.cpp b/tools/bit/util.cpp
index fc93bcb..9223931 100644
--- a/tools/bit/util.cpp
+++ b/tools/bit/util.cpp
@@ -101,7 +101,6 @@
 void
 get_directory_contents(const string& name, map<string,FileInfo>* results)
 {
-    int err;
     DIR* dir = opendir(name.c_str());
     if (dir == NULL) {
         return;
@@ -241,7 +240,9 @@
     fseek(file, 0, SEEK_SET);
 
     char* buf = (char*)malloc(size);
-    fread(buf, 1, size, file);
+    if ((size_t) size != fread(buf, 1, size, file)) {
+        return string();
+    }
 
     string result(buf, size);