commit 7ea3e97da91f9df814a4e7e0781c4620efce40f9
author Narayan Kamath <narayan@google.com> Mon Mar 16 14:10:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 16 14:10:16 2015 +0000
tree 54984a4181a5aa6e3615e4d98209829fecbee62c
parent e09c8ae9521b25d8650b57ba6383e8af36e830b9
parent ed8f8fd1b665ff515729ba45a58e11543b5ae426

am c5cb0014: am b750efcc: Merge "Fix a wonkily named function."

* commit 'c5cb001412154580b1017189df687dfce6ccda69':
  Fix a wonkily named function.

libzipfile/zipfile.c

diff --git a/libzipfile/zipfile.c b/libzipfile/zipfile.c
index b903fcf..1032ecc 100644
--- a/libzipfile/zipfile.c
+++ b/libzipfile/zipfile.c
@@ -76,7 +76,7 @@
 };
 
 static int
-uninflate(unsigned char* out, int unlen, const unsigned char* in, int clen)
+inflate_wrapper(unsigned char* out, int unlen, const unsigned char* in, int clen)
 {
     z_stream zstream;
     int err = 0;
@@ -121,7 +121,7 @@
             memcpy(buf, entry->data, entry->uncompressedSize);
             return 0;
         case DEFLATED:
-            return uninflate(buf, bufsize, entry->data, entry->compressedSize);
+            return inflate_wrapper(buf, bufsize, entry->data, entry->compressedSize);
         default:
             return -1;
     }