Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce204559 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "libidmap2: track libziparchive API change." into qt-dev-plus-aosp 

am: 0d85be2e

Change-Id: I136d88e38f39dd4c616e80aa2e44d06e4e205b75
parents d8d9ae15 0d85be2e

cmds/idmap2/libidmap2/ZipFile.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ ZipFile::~ZipFile() { 


std::unique_ptr<const MemoryChunk> ZipFile::Uncompress(const std::string& entryPath) const {

  ::ZipEntry entry;

  int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry);

  int32_t status = ::FindEntry(handle_, entryPath, &entry);

  if (status != 0) {

    return nullptr;

  }
@@ -59,7 +59,7 @@ std::unique_ptr<const MemoryChunk> ZipFile::Uncompress(const std::string& entryP 


Result<uint32_t> ZipFile::Crc(const std::string& entryPath) const {

  ::ZipEntry entry;

  int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry);

  int32_t status = ::FindEntry(handle_, entryPath, &entry);

  if (status != 0) {

    return Error("failed to find zip entry %s", entryPath.c_str());

  }