summaryrefslogtreecommitdiffstats
path: root/updater/blockimg.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2019-05-07 01:45:16 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-05-07 01:45:16 +0200
commit9423d2f6b7efcc94679ecdda5c5ca15039407d6b (patch)
tree1284c020d0c3ed532f72ee1702b424339016871c /updater/blockimg.cpp
parentMerge "Disable libbootloader_message for darwin" (diff)
parentTrack libziparchive API change. (diff)
downloadandroid_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.gz
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.bz2
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.lz
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.xz
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.tar.zst
android_bootable_recovery-9423d2f6b7efcc94679ecdda5c5ca15039407d6b.zip
Diffstat (limited to 'updater/blockimg.cpp')
-rw-r--r--updater/blockimg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 07c3c7b52..b008c28b4 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -1680,7 +1680,7 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
return StringValue("");
}
- ZipString path_data(patch_data_fn->data.c_str());
+ std::string_view path_data(patch_data_fn->data);
ZipEntry patch_entry;
if (FindEntry(za, path_data, &patch_entry) != 0) {
LOG(ERROR) << name << "(): no file \"" << patch_data_fn->data << "\" in package";
@@ -1688,7 +1688,7 @@ static Value* PerformBlockImageUpdate(const char* name, State* state,
}
params.patch_start = ui->package_zip_addr + patch_entry.offset;
- ZipString new_data(new_data_fn->data.c_str());
+ std::string_view new_data(new_data_fn->data);
ZipEntry new_entry;
if (FindEntry(za, new_data, &new_entry) != 0) {
LOG(ERROR) << name << "(): no file \"" << new_data_fn->data << "\" in package";