commit 4bd58951456ac6082e23a1931293965852c24281
author Bernie Innocenti <codewiz@google.com> Thu Feb 06 15:43:57 2020 +0900
committer Bernie Innocenti <codewiz@google.com> Fri Feb 07 11:41:44 2020 +0000
tree dd263ff127686a283290ca8dd572a9d5f54879ee
parent 22be0659402081b59d84d01ec3e7f8aec42d18ad

Convert art/ to Result::ok()

No functionality changes, this is a mechanical cleanup.

Test: m
Change-Id: I10030314ad8a06d49a63f1e2f3c5aa5b484e34b6

libnativeloader/public_libraries.cpp

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index fc99c36..5cdfa94 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -112,7 +112,7 @@
     return ErrnoError();
   }
   Result<std::vector<std::string>> result = ParseConfig(file_content, filter_fn);
-  if (!result) {
+  if (!result.ok()) {
     return Errorf("Cannot parse {}: {}", configFile, result.error().message());
   }
   return result;
@@ -148,7 +148,7 @@
                               entry.soname, company_name);
               }
             });
-        if (ret) {
+        if (ret.ok()) {
           sonames->insert(sonames->end(), ret->begin(), ret->end());
         } else {
           LOG_ALWAYS_FATAL("Error reading public native library list from \"%s\": %s",
@@ -169,7 +169,7 @@
           return true;
         }
       });
-  if (!sonames) {
+  if (!sonames.ok()) {
     LOG_ALWAYS_FATAL("Error reading public native library list from \"%s\": %s",
                      config_file.c_str(), sonames.error().message().c_str());
     return "";
@@ -231,7 +231,7 @@
 static std::string InitVendorPublicLibraries() {
   // This file is optional, quietly ignore if the file does not exist.
   auto sonames = ReadConfig(kVendorPublicLibrariesFile, always_true);
-  if (!sonames) {
+  if (!sonames.ok()) {
     return "";
   }
   return android::base::Join(*sonames, ':');
@@ -254,7 +254,7 @@
   std::string config_file = kLlndkLibrariesFile;
   InsertVndkVersionStr(&config_file);
   auto sonames = ReadConfig(config_file, always_true);
-  if (!sonames) {
+  if (!sonames.ok()) {
     LOG_ALWAYS_FATAL("%s", sonames.error().message().c_str());
     return "";
   }
@@ -265,7 +265,7 @@
   std::string config_file = kVndkLibrariesFile;
   InsertVndkVersionStr(&config_file);
   auto sonames = ReadConfig(config_file, always_true);
-  if (!sonames) {
+  if (!sonames.ok()) {
     LOG_ALWAYS_FATAL("%s", sonames.error().message().c_str());
     return "";
   }
@@ -379,7 +379,7 @@
 #endif
 
     Result<bool> ret = filter_fn(entry);
-    if (!ret) {
+    if (!ret.ok()) {
       return ret.error();
     }
     if (*ret) {