am 463e2510: am b9b50b4e: Merge "libziparchive: Turn on -Werror" (c9607941) · Commits · e / os / android_system_core

libziparchive/Android.mk

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,7 @@ LOCAL_SHARED_LIBRARIES := libutils
	LOCAL_MODULE:= libziparchive		LOCAL_MODULE:= libziparchive

	LOCAL_C_INCLUDES += ${includes}		LOCAL_C_INCLUDES += ${includes}
			LOCAL_CFLAGS := -Werror
	include $(BUILD_STATIC_LIBRARY)		include $(BUILD_STATIC_LIBRARY)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	@@ -40,6 +41,7 @@ LOCAL_C_INCLUDES += ${includes}

	LOCAL_STATIC_LIBRARIES := libz libutils		LOCAL_STATIC_LIBRARIES := libz libutils
	LOCAL_MODULE:= libziparchive-host		LOCAL_MODULE:= libziparchive-host
			LOCAL_CFLAGS := -Werror
	include $(BUILD_HOST_STATIC_LIBRARY)		include $(BUILD_HOST_STATIC_LIBRARY)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	@@ -47,7 +49,8 @@ LOCAL_MODULE := ziparchive-tests
	LOCAL_CPP_EXTENSION := .cc		LOCAL_CPP_EXTENSION := .cc
	LOCAL_CFLAGS += \		LOCAL_CFLAGS += \
	-DGTEST_OS_LINUX_ANDROID \		-DGTEST_OS_LINUX_ANDROID \
	-DGTEST_HAS_STD_STRING		-DGTEST_HAS_STD_STRING \
			-Werror
	LOCAL_SRC_FILES := zip_archive_test.cc		LOCAL_SRC_FILES := zip_archive_test.cc
	LOCAL_SHARED_LIBRARIES := liblog		LOCAL_SHARED_LIBRARIES := liblog
	LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils		LOCAL_STATIC_LIBRARIES := libziparchive libz libgtest libgtest_main libutils
	@@ -58,7 +61,8 @@ LOCAL_MODULE := ziparchive-tests-host
	LOCAL_CPP_EXTENSION := .cc		LOCAL_CPP_EXTENSION := .cc
	LOCAL_CFLAGS += \		LOCAL_CFLAGS += \
	-DGTEST_OS_LINUX \		-DGTEST_OS_LINUX \
	-DGTEST_HAS_STD_STRING		-DGTEST_HAS_STD_STRING \
			-Werror
	LOCAL_SRC_FILES := zip_archive_test.cc		LOCAL_SRC_FILES := zip_archive_test.cc
	LOCAL_STATIC_LIBRARIES := libziparchive-host \		LOCAL_STATIC_LIBRARIES := libziparchive-host \
	libz \		libz \

libziparchive/zip_archive.cc

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@
	#include <stdlib.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>
	#include <unistd.h>		#include <unistd.h>
			#include <utils/Compat.h>
	#include <utils/FileMap.h>		#include <utils/FileMap.h>
	#include <zlib.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));		ssize_t actual = TEMP_FAILURE_RETRY(read(fd, buf, get_size));

	if (actual != 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;		return kIoError;
	}		}

	@@ -900,10 +901,10 @@ static int32_t InflateToFile(int fd, const ZipEntry* entry,
	do {		do {
	/* read as much as we can */		/* read as much as we can */
	if (zstream.avail_in == 0) {		if (zstream.avail_in == 0) {
	const ssize_t getSize = (compressed_length > kBufSize) ? kBufSize : compressed_length;		const ZD_TYPE getSize = (compressed_length > kBufSize) ? kBufSize : compressed_length;
	const ssize_t actual = TEMP_FAILURE_RETRY(read(fd, read_buf, getSize));		const ZD_TYPE actual = TEMP_FAILURE_RETRY(read(fd, read_buf, getSize));
	if (actual != 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;		result = kIoError;
	goto z_bail;		goto z_bail;
	}		}