am c5cb001: am b750efc: Merge "Fix a wonkily named function."

* commit 'c5cb001412154580b1017189df687dfce6ccda69': Fix a wonkily named function.
Havoc-OS · Mar 16, 2015 · 778b9c8 · 778b9c8
2 parents 3e1c17e + c5cb001
commit 778b9c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libzipfile/zipfile.c b/libzipfile/zipfile.c
@@ -76,7 +76,7 @@ enum {
 };
 
 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 @@ decompress_zipentry(zipentry_t e, void* buf, int bufsize)
             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;
     }