commit 404c5408a0be7cc42d3c1c4af4e87b7daed39862
author Narayan Kamath <narayan@google.com> Tue Dec 10 17:46:14 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 10 17:46:14 2013 +0000
tree d3e3268234e7f1b463f7b65e3ed86d38a2a1fe83
parent 6fec3a23046a3100c2ce1863afdd0191da69cdcc
parent eb41ad212e125aa81f09df850e0c41e11ba96043

Merge "Fix return code for ended iteration."

libziparchive/zip_archive.cc

diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc
index 83b7c5b..b63ac79 100644
--- a/libziparchive/zip_archive.cc
+++ b/libziparchive/zip_archive.cc
@@ -86,7 +86,7 @@
 
 static const char* kErrorMessages[] = {
   "Unknown return code.",
-  "I/O Error",
+  "Iteration ended",
   "Zlib error",
   "Invalid file",
   "Invalid handle",
@@ -96,13 +96,12 @@
   "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 @@
 // 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