summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader.cpp
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2020-02-06 15:43:57 +0900
committerBernie Innocenti <codewiz@google.com>2020-02-07 11:41:44 +0000
commit4bd58951456ac6082e23a1931293965852c24281 (patch)
treedd263ff127686a283290ca8dd572a9d5f54879ee /libnativeloader/native_loader.cpp
parent22be0659402081b59d84d01ec3e7f8aec42d18ad (diff)
Convert art/ to Result::ok()
No functionality changes, this is a mechanical cleanup. Test: m Change-Id: I10030314ad8a06d49a63f1e2f3c5aa5b484e34b6
Diffstat (limited to 'libnativeloader/native_loader.cpp')
-rw-r--r--libnativeloader/native_loader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index efcb76992f..4e5189b4bf 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -94,7 +94,7 @@ jstring CreateClassLoaderNamespace(JNIEnv* env, int32_t target_sdk_version, jobj
std::lock_guard<std::mutex> guard(g_namespaces_mutex);
auto ns = g_namespaces->Create(env, target_sdk_version, class_loader, is_shared, dex_path,
library_path, permitted_path);
- if (!ns) {
+ if (!ns.ok()) {
return env->NewStringUTF(ns.error().message().c_str());
}
#else
@@ -140,7 +140,7 @@ void* OpenNativeLibrary(JNIEnv* env, int32_t target_sdk_version, const char* pat
Result<NativeLoaderNamespace*> isolated_ns =
g_namespaces->Create(env, target_sdk_version, class_loader, false /* is_shared */, nullptr,
library_path, nullptr);
- if (!isolated_ns) {
+ if (!isolated_ns.ok()) {
*error_msg = strdup(isolated_ns.error().message().c_str());
return nullptr;
} else {
@@ -224,13 +224,13 @@ void NativeLoaderFreeErrorMessage(char* msg) {
void* OpenNativeLibraryInNamespace(NativeLoaderNamespace* ns, const char* path,
bool* needs_native_bridge, char** error_msg) {
auto handle = ns->Load(path);
- if (!handle && error_msg != nullptr) {
+ if (!handle.ok() && error_msg != nullptr) {
*error_msg = strdup(handle.error().message().c_str());
}
if (needs_native_bridge != nullptr) {
*needs_native_bridge = ns->IsBridged();
}
- return handle ? *handle : nullptr;
+ return handle.ok() ? *handle : nullptr;
}
// native_bridge_namespaces are not supported for callers of this function.