summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2022-06-20 21:04:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-20 21:04:08 +0000
commita35d0912a3ff9bb6a574014fde50ec5dc63ca036 (patch)
treefebc1271093fe1fa031450809dff68b2d85aa15d
parentcde63b5b82ec44cffbe1d947771b57e7509c6291 (diff)
parent1cd56433b641c91563c60378273ea9b3aefb3a20 (diff)
downloadnet-a35d0912a3ff9bb6a574014fde50ec5dc63ca036.tar.gz
BpfMap: simplify .init() mMapFd assignment am: 1cd56433b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/18992755 Change-Id: I1a5f6b4c769f5748ee5897eecc7501948fb4a6db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/native/bpf_headers/include/bpf/BpfMap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/native/bpf_headers/include/bpf/BpfMap.h b/common/native/bpf_headers/include/bpf/BpfMap.h
index d07d6104..86c0756e 100644
--- a/common/native/bpf_headers/include/bpf/BpfMap.h
+++ b/common/native/bpf_headers/include/bpf/BpfMap.h
@@ -196,7 +196,7 @@ class BpfMap {
template <class Key, class Value>
base::Result<void> BpfMap<Key, Value>::init(const char* path) {
- mMapFd = base::unique_fd(mapRetrieveRW(path));
+ mMapFd.reset(mapRetrieveRW(path));
if (mMapFd == -1) {
return ErrnoErrorf("Pinned map not accessible or does not exist: ({})", path);
}