commit 2bb8c5cd27c813a0badf5aca6a6349c5a669b6ff
author Maciej Żenczykowski <maze@google.com> Mon Aug 21 17:14:55 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 21 17:14:55 2023 +0000
tree 43337af11cd154f680e941f67aaabb8ce0b7af57
parent 656c77f4f07157a0c8a3507a5c86ae52f292bba6
parent 910cf4da9b6c1909a466b9e17f5f90676b54453b

Merge "BpfMap - slightly simplify isEmpty()" into main

staticlibs/native/bpf_headers/include/bpf/BpfMap.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
index 51e6d16..1ddcfe6 100644
--- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
+++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -235,12 +235,9 @@
 
     base::Result<bool> isEmpty() const {
         auto key = getFirstKey();
-        if (!key.ok()) {
-            // Return error code ENOENT means the map is empty
-            if (key.error().code() == ENOENT) return true;
-            return key.error();
-        }
-        return false;
+        if (key.ok()) return false;
+        if (key.error().code() == ENOENT) return true;
+        return key.error();
     }
 
   private: