commit 615fd7410a1c1a459c45cb610fe359bedcfb3cc1
author Bernie Innocenti <codewiz@google.com> Thu Feb 06 03:55:09 2020 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Feb 06 03:58:30 2020 +0900
tree b6ba8787719fcc0424a8914e3173e441cc58c6fd
parent cffca8e99aa6a4dcc41cb3237647698fce3b8cd8

Convert system/netd to Result::ok()

No functionality changes, this is a mechanical cleanup.

Change-Id: I3181d34b52a05ed26296e2e0e72a5cdb8e955712

libnetdbpf/BpfNetworkStats.cpp

diff --git a/libnetdbpf/BpfNetworkStats.cpp b/libnetdbpf/BpfNetworkStats.cpp
index 7ed4018..a77f6f9 100644
--- a/libnetdbpf/BpfNetworkStats.cpp
+++ b/libnetdbpf/BpfNetworkStats.cpp
@@ -47,13 +47,14 @@
 int bpfGetUidStatsInternal(uid_t uid, Stats* stats,
                            const BpfMap<uint32_t, StatsValue>& appUidStatsMap) {
     auto statsEntry = appUidStatsMap.readValue(uid);
-    if (statsEntry) {
+    if (statsEntry.ok()) {
         stats->rxPackets = statsEntry.value().rxPackets;
         stats->txPackets = statsEntry.value().txPackets;
         stats->rxBytes = statsEntry.value().rxBytes;
         stats->txBytes = statsEntry.value().txBytes;
     }
-    return (statsEntry || statsEntry.error().code() == ENOENT) ? 0 : -statsEntry.error().code();
+    return (statsEntry.ok() || statsEntry.error().code() == ENOENT) ? 0
+                                                                    : -statsEntry.error().code();
 }
 
 int bpfGetUidStats(uid_t uid, Stats* stats) {
@@ -84,7 +85,7 @@
         }
         if (!iface || !strcmp(iface, ifname)) {
             Result<StatsValue> statsEntry = ifaceStatsMap.readValue(key);
-            if (!statsEntry) {
+            if (!statsEntry.ok()) {
                 return statsEntry.error();
             }
             stats->rxPackets += statsEntry.value().rxPackets;
@@ -95,7 +96,7 @@
         return Result<void>();
     };
     auto res = ifaceStatsMap.iterate(processIfaceStats);
-    return res ? 0 : -res.error().code();
+    return res.ok() ? 0 : -res.error().code();
 }
 
 int bpfGetIfaceStats(const char* iface, Stats* stats) {
@@ -156,14 +157,14 @@
             return Result<void>();
         }
         Result<StatsValue> statsEntry = statsMap.readValue(key);
-        if (!statsEntry) {
+        if (!statsEntry.ok()) {
             return base::ResultError(statsEntry.error().message(), statsEntry.error().code());
         }
         lines->push_back(populateStatsEntry(key, statsEntry.value(), ifname));
         return Result<void>();
     };
     Result<void> res = statsMap.iterate(processDetailUidStats);
-    if (!res) {
+    if (!res.ok()) {
         ALOGE("failed to iterate per uid Stats map for detail traffic stats: %s",
               strerror(res.error().code()));
         return -res.error().code();
@@ -199,7 +200,7 @@
         return ret;
     }
     auto configuration = configurationMap.readValue(CURRENT_STATS_MAP_CONFIGURATION_KEY);
-    if (!configuration) {
+    if (!configuration.ok()) {
         ALOGE("Cannot read the old configuration from map: %s",
               configuration.error().message().c_str());
         return -configuration.error().code();
@@ -222,7 +223,7 @@
     }
 
     Result<void> res = statsMap.clear();
-    if (!res) {
+    if (!res.ok()) {
         ALOGE("Clean up current stats map failed: %s", strerror(res.error().code()));
         return -res.error().code();
     }
@@ -250,7 +251,7 @@
         return Result<void>();
     };
     Result<void> res = statsMap.iterateWithValue(processDetailIfaceStats);
-    if (!res) {
+    if (!res.ok()) {
         ALOGE("failed to iterate per uid Stats map for detail traffic stats: %s",
               strerror(res.error().code()));
         return -res.error().code();