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

* commit 'b750efcc302f2cb50abe1eb20dc92414636cb5d2':
  Fix a wonkily named function.
This commit is contained in:
Narayan Kamath 2015-03-16 14:03:36 +00:00 committed by Android Git Automerger
commit c5cb001412

View file

@ -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;
}