am 025c0e79: Merge "Clean up LOG functions." (328cb8cb) · Commits · e / os / android_bootable_recovery

minzip/Hash.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -373,7 +373,7 @@ void mzHashTableProbeCount(HashTable* pHashTable, HashCalcFunc calcFunc,
		totalProbe += count;
		}

		LOGI("Probe: min=%d max=%d, total=%d in %d (%d), avg=%.3f\n",
		LOGV("Probe: min=%d max=%d, total=%d in %d (%d), avg=%.3f\n",
		minProbe, maxProbe, totalProbe, numEntries, pHashTable->tableSize,
		(float) totalProbe / (float) numEntries);
		}

minzip/SysUtil.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -25,13 +25,13 @@ static bool sysMapFD(int fd, MemMapping* pMap) {

		struct stat sb;
		if (fstat(fd, &sb) == -1) {
		LOGW("fstat(%d) failed: %s\n", fd, strerror(errno));
		LOGE("fstat(%d) failed: %s\n", fd, strerror(errno));
		return false;
		}

		void* memPtr = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
		if (memPtr == MAP_FAILED) {
		LOGW("mmap(%d, R, PRIVATE, %d, 0) failed: %s\n", (int) sb.st_size, fd, strerror(errno));
		LOGE("mmap(%d, R, PRIVATE, %d, 0) failed: %s\n", (int) sb.st_size, fd, strerror(errno));
		return false;
		}

		@@ -55,7 +55,7 @@ static int sysMapBlockFile(FILE* mapf, MemMapping* pMap)
		unsigned int i;

		if (fgets(block_dev, sizeof(block_dev), mapf) == NULL) {
		LOGW("failed to read block device from header\n");
		LOGE("failed to read block device from header\n");
		return -1;
		}
		for (i = 0; i < sizeof(block_dev); ++i) {
		@@ -66,7 +66,7 @@ static int sysMapBlockFile(FILE* mapf, MemMapping* pMap)
		}

		if (fscanf(mapf, "%zu %u\n%u\n", &size, &blksize, &range_count) != 3) {
		LOGW("failed to parse block map header\n");
		LOGE("failed to parse block map header\n");
		return -1;
		}

		@@ -80,7 +80,7 @@ static int sysMapBlockFile(FILE* mapf, MemMapping* pMap)
		unsigned char* reserve;
		reserve = mmap64(NULL, blocks * blksize, PROT_NONE, MAP_PRIVATE \| MAP_ANON, -1, 0);
		if (reserve == MAP_FAILED) {
		LOGW("failed to reserve address space: %s\n", strerror(errno));
		LOGE("failed to reserve address space: %s\n", strerror(errno));
		return -1;
		}

		@@ -89,7 +89,7 @@ static int sysMapBlockFile(FILE* mapf, MemMapping* pMap)

		int fd = open(block_dev, O_RDONLY);
		if (fd < 0) {
		LOGW("failed to open block device %s: %s\n", block_dev, strerror(errno));
		LOGE("failed to open block device %s: %s\n", block_dev, strerror(errno));
		return -1;
		}

		@@ -97,13 +97,13 @@ static int sysMapBlockFile(FILE* mapf, MemMapping* pMap)
		for (i = 0; i < range_count; ++i) {
		int start, end;
		if (fscanf(mapf, "%d %d\n", &start, &end) != 2) {
		LOGW("failed to parse range %d in block map\n", i);
		LOGE("failed to parse range %d in block map\n", i);
		return -1;
		}

		void* addr = mmap64(next, (end-start)blksize, PROT_READ, MAP_PRIVATE \| MAP_FIXED, fd, ((off64_t)start)blksize);
		if (addr == MAP_FAILED) {
		LOGW("failed to map block %d: %s\n", i, strerror(errno));
		LOGE("failed to map block %d: %s\n", i, strerror(errno));
		return -1;
		}
		pMap->ranges[i].addr = addr;
		@@ -128,12 +128,12 @@ int sysMapFile(const char* fn, MemMapping* pMap)
		// A map of blocks
		FILE* mapf = fopen(fn+1, "r");
		if (mapf == NULL) {
		LOGV("Unable to open '%s': %s\n", fn+1, strerror(errno));
		LOGE("Unable to open '%s': %s\n", fn+1, strerror(errno));
		return -1;
		}

		if (sysMapBlockFile(mapf, pMap) != 0) {
		LOGW("Map of '%s' failed\n", fn);
		LOGE("Map of '%s' failed\n", fn);
		return -1;
		}

		@@ -165,7 +165,7 @@ void sysReleaseMap(MemMapping* pMap)
		int i;
		for (i = 0; i < pMap->range_count; ++i) {
		if (munmap(pMap->ranges[i].addr, pMap->ranges[i].length) < 0) {
		LOGW("munmap(%p, %d) failed: %s\n",
		LOGE("munmap(%p, %d) failed: %s\n",
		pMap->ranges[i].addr, (int)pMap->ranges[i].length, strerror(errno));
		}
		}

minzip/Zip.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -198,10 +198,10 @@ static bool parseZipArchive(ZipArchive* pArchive)
		*/
		val = get4LE(pArchive->addr);
		if (val == ENDSIG) {
		LOGI("Found Zip archive, but it looks empty\n");
		LOGW("Found Zip archive, but it looks empty\n");
		goto bail;
		} else if (val != LOCSIG) {
		LOGV("Not a Zip archive (found 0x%08x)\n", val);
		LOGW("Not a Zip archive (found 0x%08x)\n", val);
		goto bail;
		}

		@@ -217,7 +217,7 @@ static bool parseZipArchive(ZipArchive* pArchive)
		ptr--;
		}
		if (ptr < (const unsigned char*) pArchive->addr) {
		LOGI("Could not find end-of-central-directory in Zip\n");
		LOGW("Could not find end-of-central-directory in Zip\n");
		goto bail;
		}

		@@ -429,7 +429,7 @@ int mzOpenZipArchive(unsigned char* addr, size_t length, ZipArchive* pArchive)

		if (length < ENDHDR) {
		err = -1;
		LOGV("File '%s' too small to be zip (%zd)\n", fileName, map.length);
		LOGW("Archive %p is too small to be zip (%zd)\n", pArchive, length);
		goto bail;
		}

		@@ -438,7 +438,7 @@ int mzOpenZipArchive(unsigned char* addr, size_t length, ZipArchive* pArchive)

		if (!parseZipArchive(pArchive)) {
		err = -1;
		LOGV("Parsing '%s' failed\n", fileName);
		LOGW("Parsing archive %p failed\n", pArchive);
		goto bail;
		}

		@@ -548,7 +548,7 @@ static bool processDeflatedEntry(const ZipArchive *pArchive,
		/* uncompress the data */
		zerr = inflate(&zstream, Z_NO_FLUSH);
		if (zerr != Z_OK && zerr != Z_STREAM_END) {
		LOGD("zlib inflate call failed (zerr=%d)\n", zerr);
		LOGW("zlib inflate call failed (zerr=%d)\n", zerr);
		goto z_bail;
		}

		@@ -1007,7 +1007,7 @@ bool mzExtractRecursive(const ZipArchive *pArchive,
		if (callback != NULL) callback(targetFile, cookie);
		}

		LOGD("Extracted %d file(s)\n", extractCount);
		LOGV("Extracted %d file(s)\n", extractCount);

		free(helper.buf);
		free(zpath);