diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-05-05 14:38:05 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-05-07 16:56:21 -0700 |
| commit | 51d562d39976451a3a29992b00f36ea54e06c4af (patch) | |
| tree | 9d16f91283a8342db6274c0cef5a02913dfa3557 | |
| parent | b9f5a2b9a0f4f08050dd2b88c64493836edc74dd (diff) | |
| download | system_core-51d562d39976451a3a29992b00f36ea54e06c4af.zip system_core-51d562d39976451a3a29992b00f36ea54e06c4af.tar.gz system_core-51d562d39976451a3a29992b00f36ea54e06c4af.tar.bz2 | |
libziparchive: Turn on -Werror
Change-Id: I98a93273b9e1bac0324dd210f6a8493ba780e878
| -rw-r--r-- | libziparchive/Android.mk | 8 | ||||
| -rw-r--r-- | libziparchive/zip_archive.cc | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index e754c3b..1d48fea 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -30,6 +30,7 @@ LOCAL_SHARED_LIBRARIES := libutils LOCAL_MODULE:= libziparchive LOCAL_C_INCLUDES += ${includes} +LOCAL_CFLAGS := -Werror include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -40,6 +41,7 @@ LOCAL_C_INCLUDES += ${includes} LOCAL_STATIC_LIBRARIES := libz libutils LOCAL_MODULE:= libziparchive-host +LOCAL_CFLAGS := -Werror include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -47,7 +49,8 @@ LOCAL_MODULE := ziparchive-tests LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS += \ -DGTEST_OS_LINUX_ANDROID \ - -DGTEST_HAS_STD_STRING + -DGTEST_HAS_STD_STRING \ + -Werror LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_SHARED_LIBRARIES := liblog LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils @@ -58,7 +61,8 @@ LOCAL_MODULE := ziparchive-tests-host LOCAL_CPP_EXTENSION := .cc LOCAL_CFLAGS += \ -DGTEST_OS_LINUX \ - -DGTEST_HAS_STD_STRING + -DGTEST_HAS_STD_STRING \ + -Werror LOCAL_SRC_FILES := zip_archive_test.cc LOCAL_STATIC_LIBRARIES := libziparchive-host \ libz \ diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index aebddc8..f1780f4 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -27,6 +27,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <utils/Compat.h> #include <utils/FileMap.h> #include <zlib.h> @@ -218,7 +219,7 @@ static int32_t CopyFileToFile(int fd, uint8_t* begin, const uint32_t length, uin ssize_t actual = TEMP_FAILURE_RETRY(read(fd, buf, get_size)); if (actual != get_size) { - ALOGW("CopyFileToFile: copy read failed (%zd vs %zd)", actual, get_size); + ALOGW("CopyFileToFile: copy read failed (" ZD " vs " ZD ")", actual, get_size); return kIoError; } @@ -900,10 +901,10 @@ static int32_t InflateToFile(int fd, const ZipEntry* entry, do { /* read as much as we can */ if (zstream.avail_in == 0) { - const ssize_t getSize = (compressed_length > kBufSize) ? kBufSize : compressed_length; - const ssize_t actual = TEMP_FAILURE_RETRY(read(fd, read_buf, getSize)); + const ZD_TYPE getSize = (compressed_length > kBufSize) ? kBufSize : compressed_length; + const ZD_TYPE actual = TEMP_FAILURE_RETRY(read(fd, read_buf, getSize)); if (actual != getSize) { - ALOGW("Zip: inflate read failed (%zd vs %zd)", actual, getSize); + ALOGW("Zip: inflate read failed (" ZD " vs " ZD ")", actual, getSize); result = kIoError; goto z_bail; } |