Convert system/netd to Result::ok()

No functionality changes, this is a mechanical cleanup.

Change-Id: I3181d34b52a05ed26296e2e0e72a5cdb8e955712

1 files changed, 28 insertions, 19 deletions

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 728ae69af..e310a83c7 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -82,9 +82,9 @@ void ClatdController::resetEgressMap() {
         return Result<void>();  // keep on going regardless
     };
     auto ret = mClatEgressMap.iterate(del);
-    if (!ret) ALOGE("mClatEgressMap.iterate() failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatEgressMap.iterate() failure: %s", strerror(ret.error().code()));
     ret = mClatEgressMap.clear();
-    if (!ret) ALOGE("mClatEgressMap.clear() failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatEgressMap.clear() failure: %s", strerror(ret.error().code()));
 }
 
 void ClatdController::resetIngressMap() {
@@ -98,9 +98,9 @@ void ClatdController::resetIngressMap() {
         return Result<void>();  // keep on going regardless
     };
     auto ret = mClatIngressMap.iterate(del);
-    if (!ret) ALOGE("mClatIngressMap.iterate() failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatIngressMap.iterate() failure: %s", strerror(ret.error().code()));
     ret = mClatIngressMap.clear();
-    if (!ret) ALOGE("mClatIngressMap.clear() failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatIngressMap.clear() failure: %s", strerror(ret.error().code()));
 }
 
 void ClatdController::init(void) {
@@ -320,7 +320,7 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
     };
 
     auto ret = mClatEgressMap.writeValue(txKey, txValue, BPF_ANY);
-    if (!ret) {
+    if (!ret.ok()) {
         ALOGE("mClatEgressMap.writeValue failure: %s", strerror(ret.error().code()));
         return;
     }
@@ -337,10 +337,11 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
     };
 
     ret = mClatIngressMap.writeValue(rxKey, rxValue, BPF_ANY);
-    if (!ret) {
+    if (!ret.ok()) {
         ALOGE("mClatIngressMap.writeValue failure: %s", strerror(ret.error().code()));
         ret = mClatEgressMap.deleteValue(txKey);
-        if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
         return;
     }
 
@@ -352,9 +353,11 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
         ALOGE("tcQdiscAddDevClsact(%d[%s]) failure: %s", tracker.ifIndex, tracker.iface,
               strerror(-rv));
         ret = mClatEgressMap.deleteValue(txKey);
-        if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
         ret = mClatIngressMap.deleteValue(rxKey);
-        if (!ret) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
         return;
     }
 
@@ -368,9 +371,11 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
                   strerror(-rv));
         }
         ret = mClatEgressMap.deleteValue(txKey);
-        if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
         ret = mClatIngressMap.deleteValue(rxKey);
-        if (!ret) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
         return;
     }
 
@@ -394,9 +399,11 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
                   strerror(-rv));
         }
         ret = mClatEgressMap.deleteValue(txKey);
-        if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
         ret = mClatIngressMap.deleteValue(rxKey);
-        if (!ret) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
         return;
     }
 
@@ -420,9 +427,11 @@ void ClatdController::maybeStartBpf(const ClatdTracker& tracker) {
                   strerror(-rv));
         }
         ret = mClatEgressMap.deleteValue(txKey);
-        if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
         ret = mClatIngressMap.deleteValue(rxKey);
-        if (!ret) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
+        if (!ret.ok())
+            ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
         return;
     }
 
@@ -466,7 +475,7 @@ void ClatdController::maybeStopBpf(const ClatdTracker& tracker) {
     };
 
     auto ret = mClatEgressMap.deleteValue(txKey);
-    if (!ret) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatEgressMap.deleteValue failure: %s", strerror(ret.error().code()));
 
     ClatIngressKey rxKey = {
             .iif = tracker.ifIndex,
@@ -475,7 +484,7 @@ void ClatdController::maybeStopBpf(const ClatdTracker& tracker) {
     };
 
     ret = mClatIngressMap.deleteValue(rxKey);
-    if (!ret) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
+    if (!ret.ok()) ALOGE("mClatIngressMap.deleteValue failure: %s", strerror(ret.error().code()));
 }
 
 // Finds the tracker of the clatd running on interface |interface|, or nullptr if clatd has not been
@@ -719,7 +728,7 @@ void ClatdController::dumpEgress(DumpWriter& dw) {
         return Result<void>();
     };
     auto res = mClatEgressMap.iterateWithValue(printClatMap);
-    if (!res) {
+    if (!res.ok()) {
         dw.println("Error printing BPF map: %s", res.error().message().c_str());
     }
 }
@@ -750,7 +759,7 @@ void ClatdController::dumpIngress(DumpWriter& dw) {
         return Result<void>();
     };
     auto res = mClatIngressMap.iterateWithValue(printClatMap);
-    if (!res) {
+    if (!res.ok()) {
         dw.println("Error printing BPF map: %s", res.error().message().c_str());
     }
 }