diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-10-16 20:39:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-16 20:39:41 +0000 |
| commit | e1e0785c38488a48e03d939508b89ba3cadc84cc (patch) | |
| tree | 460dbd3e8d3d2ecda6c7be2b18d9bbf00961fd4b /tools/bit/util.cpp | |
| parent | 7215f944016d58e69ce4f4dda1c70b9609b6faf9 (diff) | |
| parent | decc397b267ca0769a2232ebaee6580bb082e0d1 (diff) | |
Merge "Use -Werror in frameworks/base" am: 16fbd3a1d8 am: 0bfb717a37 am: 9f004b1752
am: decc397b26
Change-Id: Id4abbc6cb95b2eb96f535b6c1c5295cb27c9d2b0
Diffstat (limited to 'tools/bit/util.cpp')
| -rw-r--r-- | tools/bit/util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/bit/util.cpp b/tools/bit/util.cpp index fc93bcb8c935..922393146b10 100644 --- a/tools/bit/util.cpp +++ b/tools/bit/util.cpp @@ -101,7 +101,6 @@ TrackedFile::HasChanged() const 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 @@ read_file(const string& filename) 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); |