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

Commit 1d5745fb authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "libziparchive: remove now-unused FindEntry overload."

parents 766e8782 a5ff19e7

libziparchive/include/ziparchive/zip_archive.h

+0 −2
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ void CloseArchive(ZipArchiveHandle archive); 
 * can be called concurrently.

 */

int32_t FindEntry(const ZipArchiveHandle archive, const std::string_view entryName, ZipEntry* data);

// TODO: remove this internally, where there is a new user.

int32_t FindEntry(const ZipArchiveHandle archive, const ZipString& entryName, ZipEntry* data);



/*

 * Start iterating over all entries of a zip file. The order of iteration

libziparchive/zip_archive.cc

+1 −18
Original line number Diff line number Diff line
@@ -741,23 +741,6 @@ void EndIteration(void* cookie) { 
  delete reinterpret_cast<IterationHandle*>(cookie);

}



// TODO: remove this internally.

int32_t FindEntry(const ZipArchiveHandle archive, const ZipString& entryName, ZipEntry* data) {

  if (entryName.name_length == 0) {

    ALOGW("Zip: Invalid filename %.*s", entryName.name_length, entryName.name);

    return kInvalidEntryName;

  }



  const int64_t ent = EntryToIndex(archive->hash_table, archive->hash_table_size, entryName,

                                   archive->central_directory.GetBasePtr());

  if (ent < 0) {

    ALOGV("Zip: Could not find entry %.*s", entryName.name_length, entryName.name);

    return static_cast<int32_t>(ent);  // kEntryNotFound is safe to truncate.

  }

  // We know there are at most hast_table_size entries, safe to truncate.

  return FindEntry(archive, static_cast<uint32_t>(ent), data);

}



int32_t FindEntry(const ZipArchiveHandle archive, const std::string_view entryName,

                  ZipEntry* data) {

  if (entryName.empty() || entryName.size() > static_cast<size_t>(UINT16_MAX)) {
@@ -771,7 +754,7 @@ int32_t FindEntry(const ZipArchiveHandle archive, const std::string_view entryNa 
    ALOGV("Zip: Could not find entry %.*s", static_cast<int>(entryName.size()), entryName.data());

    return static_cast<int32_t>(ent);  // kEntryNotFound is safe to truncate.

  }

  // We know there are at most hast_table_size entries, safe to truncate.

  // We know there are at most hash_table_size entries, safe to truncate.

  return FindEntry(archive, static_cast<uint32_t>(ent), data);

}