diff options
| -rw-r--r-- | linker/linker.cpp | 2 | ||||
| -rw-r--r-- | tests/dlext_test.cpp | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index b59df7302..0de17f780 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -1039,7 +1039,7 @@ static int open_library_in_zipfile(ZipArchiveCache* zip_archive_cache, ZipEntry entry; - if (FindEntry(handle, ZipString(file_path), &entry) != 0) { + if (FindEntry(handle, file_path, &entry) != 0) { // Entry was not found. close(fd); return -1; diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp index eed84a4c1..67ebf37df 100644 --- a/tests/dlext_test.cpp +++ b/tests/dlext_test.cpp @@ -134,10 +134,7 @@ TEST_F(DlExtTest, ExtInfoUseFdWithOffset) { ZipArchiveHandle handle; ASSERT_EQ(0, OpenArchive(lib_path.c_str(), &handle)); ZipEntry zip_entry; - ZipString zip_name; - zip_name.name = reinterpret_cast<const uint8_t*>(kLibZipSimpleZip); - zip_name.name_length = strlen(kLibZipSimpleZip); - ASSERT_EQ(0, FindEntry(handle, zip_name, &zip_entry)); + ASSERT_EQ(0, FindEntry(handle, kLibZipSimpleZip, &zip_entry)); extinfo.library_fd_offset = zip_entry.offset; CloseArchive(handle); |