diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-08-21 17:41:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-21 17:41:55 +0000 |
| commit | 15a300a8ae797551d944fa5740a7d600066a8db4 (patch) | |
| tree | 46e9c2b11887c5201416f5c97bdeb8307e4aff6a | |
| parent | f5ef373a16e5bc57b4ba4c3363002c54b9452a0c (diff) | |
| parent | 73b7da8b812d5796cea88d02f6b4d0b491481239 (diff) | |
| download | net-15a300a8ae797551d944fa5740a7d600066a8db4.tar.gz | |
Merge "BpfMap - slightly simplify isEmpty()" into main am: 73b7da8b81
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2717262
Change-Id: I0e365ceea75388212082a85b5084cb584abdf360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/native/bpf_headers/include/bpf/BpfMap.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/common/native/bpf_headers/include/bpf/BpfMap.h b/common/native/bpf_headers/include/bpf/BpfMap.h index 51e6d162..1ddcfe66 100644 --- a/common/native/bpf_headers/include/bpf/BpfMap.h +++ b/common/native/bpf_headers/include/bpf/BpfMap.h @@ -235,12 +235,9 @@ class BpfMap { 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: |