joy/android_system_bpf
Watch
1
Fork
You've already forked android_system_bpf
 0
Code Issues Pull requests Projects Releases Wiki Activity

Convert system/bpf to Result::ok()

Browse source 
No functionality changes, this is a mechanical cleanup.

Test: m
Change-Id: Ia37f81c9861be0da83a91663a9d32b6b753a527c
This commit is contained in:
Bernie Innocenti 2020-02-06 04:22:41 +09:00
commit 5953dee87d
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libbpf_android/include/bpf/BpfMap.h
View file

@ -146,7 +146,7 @@ class BpfMap {
const auto deleteAllEntries = [](const Key& key,
BpfMap<Key, Value>& map) -> base::Result<void> {
base::Result<void> res = map.deleteValue(key);
if (!res && res.error().code() != ENOENT) {
if (!res.ok() && res.error().code() != ENOENT) {
ALOGE("Failed to delete data %s", strerror(res.error().code()));
}
return {};
@ -182,10 +182,10 @@ base::Result<void> BpfMap<Key, Value>::iterate(
const std::function<base::Result<void>(const Key& key, const BpfMap<Key, Value>& map)>&
filter) const {
base::Result<Key> curKey = getFirstKey();
while (curKey) {
while (curKey.ok()) {
const base::Result<Key>& nextKey = getNextKey(curKey.value());
base::Result<void> status = filter(curKey.value(), *this);
if (!status) return status;
if (!status.ok()) return status;
curKey = nextKey;
}
if (curKey.error().code() == ENOENT) return {};
@ -197,12 +197,12 @@ base::Result<void> BpfMap<Key, Value>::iterateWithValue(
const std::function<base::Result<void>(const Key& key, const Value& value,
const BpfMap<Key, Value>& map)>& filter) const {
base::Result<Key> curKey = getFirstKey();
while (curKey) {
while (curKey.ok()) {
const base::Result<Key>& nextKey = getNextKey(curKey.value());
base::Result<Value> curValue = this->readValue(curKey.value());
if (!curValue) return curValue.error();
if (!curValue.ok()) return curValue.error();
base::Result<void> status = filter(curKey.value(), curValue.value(), *this);
if (!status) return status;
if (!status.ok()) return status;
curKey = nextKey;
}
if (curKey.error().code() == ENOENT) return {};
@ -213,10 +213,10 @@ template <class Key, class Value>
base::Result<void> BpfMap<Key, Value>::iterate(
const std::function<base::Result<void>(const Key& key, BpfMap<Key, Value>& map)>& filter) {
base::Result<Key> curKey = getFirstKey();
while (curKey) {
while (curKey.ok()) {
const base::Result<Key>& nextKey = getNextKey(curKey.value());
base::Result<void> status = filter(curKey.value(), *this);
if (!status) return status;
if (!status.ok()) return status;
curKey = nextKey;
}
if (curKey.error().code() == ENOENT) return {};
@ -228,12 +228,12 @@ base::Result<void> BpfMap<Key, Value>::iterateWithValue(
const std::function<base::Result<void>(const Key& key, const Value& value,
BpfMap<Key, Value>& map)>& filter) {
base::Result<Key> curKey = getFirstKey();
while (curKey) {
while (curKey.ok()) {
const base::Result<Key>& nextKey = getNextKey(curKey.value());
base::Result<Value> curValue = this->readValue(curKey.value());
if (!curValue) return curValue.error();
if (!curValue.ok()) return curValue.error();
base::Result<void> status = filter(curKey.value(), curValue.value(), *this);
if (!status) return status;
if (!status.ok()) return status;
curKey = nextKey;
}
if (curKey.error().code() == ENOENT) return {};