diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-06-25 14:39:19 -0700 |
|---|---|---|
| committer | Yusuke Sato <yusukes@google.com> | 2015-06-26 10:34:01 -0700 |
| commit | 07447544adbde8f688806b43f47c182eaeda4bb3 (patch) | |
| tree | e96c7b8d3353d0e506824044c8216c09cd77300d /fastboot/fastboot.cpp | |
| parent | f1d3d3b2477a813805b71099c60e07d36dbb225a (diff) | |
Rename ZipEntryName to ZipString
since the struct is now used for other purposes. Also add some
comparator functions to the struct to simplify zip_archive.cc.
This is a follow-up CL for f1d3d3b2477a813805b71099c60e07d36dbb225a.
Bug: 21957428
Change-Id: I60d4171eeacc561d59226d946e9eb5f9c96d80cf
Diffstat (limited to 'fastboot/fastboot.cpp')
| -rw-r--r-- | fastboot/fastboot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 4c4c95b29..b964a36c9 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -391,7 +391,7 @@ void *load_bootable_image(const char *kernel, const char *ramdisk, static void* unzip_file(ZipArchiveHandle zip, const char* entry_name, unsigned* sz) { - ZipEntryName zip_entry_name(entry_name); + ZipString zip_entry_name(entry_name); ZipEntry zip_entry; if (FindEntry(zip, zip_entry_name, &zip_entry) != 0) { fprintf(stderr, "archive does not contain '%s'\n", entry_name); @@ -453,7 +453,7 @@ static int unzip_to_file(ZipArchiveHandle zip, char* entry_name) { return -1; } - ZipEntryName zip_entry_name(entry_name); + ZipString zip_entry_name(entry_name); ZipEntry zip_entry; if (FindEntry(zip, zip_entry_name, &zip_entry) != 0) { fprintf(stderr, "archive does not contain '%s'\n", entry_name); |