ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix a wonkily named function."

Browse source
This commit is contained in:
Narayan Kamath 2015-03-16 13:51:37 +00:00 • committed by Gerrit Code Review
commit b750efcc30
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libzipfile/zipfile.c
View file

@ -76,7 +76,7 @@ enum {
}; };
static int 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; z_stream zstream;
int err = 0; int err = 0;
@ -121,7 +121,7 @@ decompress_zipentry(zipentry_t e, void* buf, int bufsize)
memcpy(buf, entry->data, entry->uncompressedSize); memcpy(buf, entry->data, entry->uncompressedSize);
return 0; return 0;
case DEFLATED: case DEFLATED:
return uninflate(buf, bufsize, entry->data, entry->compressedSize); return inflate_wrapper(buf, bufsize, entry->data, entry->compressedSize);
default: default:
return -1; return -1;
} }