ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix return code for ended iteration."

Browse source
This commit is contained in:
Narayan Kamath 2013-12-10 17:46:14 +00:00 • committed by Gerrit Code Review
commit 404c5408a0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libziparchive/zip_archive.cc
View file

@ -86,7 +86,7 @@ static const uint32_t kMaxErrorLen = 1024;
static const char* kErrorMessages[] = { static const char* kErrorMessages[] = {
"Unknown return code.", "Unknown return code.",
"I/O Error", "Iteration ended",
"Zlib error", "Zlib error",
"Invalid file", "Invalid file",
"Invalid handle", "Invalid handle",
@ -96,13 +96,12 @@ static const char* kErrorMessages[] = {
"Invalid offset", "Invalid offset",
"Inconsistent information", "Inconsistent information",
"Invalid entry name", "Invalid entry name",
"Iteration ended", "I/O Error",
}; };
static const int32_t kErrorMessageUpperBound = 0; static const int32_t kErrorMessageUpperBound = 0;
// An I/O related system call (read, lseek, ftruncate, map) failed. static const int32_t kIterationEnd = -1;
static const int32_t kIoError = -1;
// We encountered a Zlib error when inflating a stream from this file. // We encountered a Zlib error when inflating a stream from this file.
// Usually indicates file corruption. // Usually indicates file corruption.
@ -138,9 +137,10 @@ static const int32_t kInconsistentInformation = -9;
// An invalid entry name was encountered. // An invalid entry name was encountered.
static const int32_t kInvalidEntryName = -10; static const int32_t kInvalidEntryName = -10;
static const int32_t kIterationEnd = -12; // An I/O related system call (read, lseek, ftruncate, map) failed.
static const int32_t kIoError = -11;
static const int32_t kErrorMessageLowerBound = -13; static const int32_t kErrorMessageLowerBound = -12;
#ifdef PAGE_SHIFT #ifdef PAGE_SHIFT