commit 013767a0b72eaeb09422bfbb30c6522638647cee
author Maciej Żenczykowski <maze@google.com> Thu Jun 02 01:36:26 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 02 01:36:26 2022 +0000
tree 139afb20c98bcef719d4bf892de1fd036eabd2ef
parent 9840a07a375afbd26426511371611af5cb3a7e25
parent 1a31e3e68ead2cdd6018f34c8aeddf17704b778a

Merge "BpfMap: simplify .init() mMapFd assignment"

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 d07d610..86c0756 100644
--- a/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
+++ b/staticlibs/native/bpf_headers/include/bpf/BpfMap.h
@@ -196,7 +196,7 @@
 
 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);
     }