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

libziparchive: remove now-unused StartIteration overload.

Browse source 
Bug: http://b/129068177
Test: treehugger
Change-Id: If494c3031aee2bd3e72eda57de4c334f11f5a5df
This commit is contained in:
Elliott Hughes 2019-05-10 15:00:37 -07:00
parent 9426110d37
commit 13a45c01f2
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libziparchive/include/ziparchive/zip_archive.h
View file

@ -180,9 +180,6 @@ int32_t FindEntry(const ZipArchiveHandle archive, const std::string_view entryNa
int32_t StartIteration(ZipArchiveHandle archive, void** cookie_ptr,
const std::string_view optional_prefix = "",
const std::string_view optional_suffix = "");
// TODO: remove this.
int32_t StartIteration(ZipArchiveHandle archive, void** cookie_ptr,
const ZipString* optional_prefix, const ZipString* optional_suffix);
/*
* Advance to the next element in the zipfile in iteration order.

16
libziparchive/zip_archive.cc
View file

@ -726,22 +726,6 @@ int32_t StartIteration(ZipArchiveHandle archive, void** cookie_ptr,
return 0;
}
// TODO: remove this.
int32_t StartIteration(ZipArchiveHandle archive, void** cookie_ptr,
const ZipString* optional_prefix, const ZipString* optional_suffix) {
std::string prefix;
if (optional_prefix) {
prefix = std::string(reinterpret_cast<const char*>(optional_prefix->name),
optional_prefix->name_length);
}
std::string suffix;
if (optional_suffix) {
suffix = std::string(reinterpret_cast<const char*>(optional_suffix->name),
optional_suffix->name_length);
}
return StartIteration(archive, cookie_ptr, prefix.c_str(), suffix.c_str());
}
void EndIteration(void* cookie) {
delete reinterpret_cast<IterationHandle*>(cookie);
}