summaryrefslogtreecommitdiffstats
path: root/minzip
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2012-10-19 12:24:26 -0700
committerDoug Zongker <dougz@android.com>2012-10-19 12:24:26 -0700
commitbf80f49edcec6b22ad7b1219e6ed6eda1e930c8c (patch)
tree1f47c641d762aeac482cae331b04f9d4391720fa /minzip
parenta0d9ddb8f2922088b08219326afeaf532b3af5ac (diff)
downloadbootable_recovery-bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c.zip
bootable_recovery-bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c.tar.gz
bootable_recovery-bf80f49edcec6b22ad7b1219e6ed6eda1e930c8c.tar.bz2
reduce some recovery logging
Make minzip log only a count of files when extracting, not individual filenames. Make patching only chatter about free space if there's not enough and compact the other messages. Only the last 8k of the recovery log gets uploaded; this makes it more likely that we will get all of it. Change-Id: I529cb4947fe2185df82b9da5fae450a7480dcecd
Diffstat (limited to 'minzip')
-rw-r--r--minzip/Zip.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c
index c87f038..439e5d9 100644
--- a/minzip/Zip.c
+++ b/minzip/Zip.c
@@ -985,6 +985,7 @@ bool mzExtractRecursive(const ZipArchive *pArchive,
unsigned int i;
bool seenMatch = false;
int ok = true;
+ int extractCount = 0;
for (i = 0; i < pArchive->numEntries; i++) {
ZipEntry *pEntry = pArchive->pEntries + i;
if (pEntry->fileNameLen < zipDirLen) {
@@ -1150,13 +1151,16 @@ bool mzExtractRecursive(const ZipArchive *pArchive,
break;
}
- LOGD("Extracted file \"%s\"\n", targetFile);
+ LOGV("Extracted file \"%s\"\n", targetFile);
+ ++extractCount;
}
}
if (callback != NULL) callback(targetFile, cookie);
}
+ LOGD("Extracted %d file(s)\n", extractCount);
+
free(helper.buf);
free(zpath);