openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 9fde6246: am 0c2e454c: am 404c5408: Merge "Fix return code for ended iteration." 

* commit '9fde6246f84967914e0820895863bd7011058d1c':
  Fix return code for ended iteration.
This commit is contained in:
Narayan Kamath 2013-12-10 17:56:02 +00:00 committed by Android Git Automerger
parent 81fcdd250e 9fde6246f8
commit b0e08c0d81
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[] = {
"Unknown return code.",
"I/O Error",
"Iteration ended",
"Zlib error",
"Invalid file",
"Invalid handle",
@ -96,13 +96,12 @@ static const char* kErrorMessages[] = {
"Invalid offset",
"Inconsistent information",
"Invalid entry name",
"Iteration ended",
"I/O Error",
};
static const int32_t kErrorMessageUpperBound = 0;
// An I/O related system call (read, lseek, ftruncate, map) failed.
static const int32_t kIoError = -1;
static const int32_t kIterationEnd = -1;
// We encountered a Zlib error when inflating a stream from this file.
// Usually indicates file corruption.
@ -138,9 +137,10 @@ static const int32_t kInconsistentInformation = -9;
// An invalid entry name was encountered.
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