Merge "Update to fmtlib 10.1.1" into main

This commit is contained in:
Henri Chataing 2023-11-10 17:48:43 +00:00 • committed by Gerrit Code Review
commit c64eb2d816

View file

@ -59,9 +59,11 @@ Result<void> Firewall::toggleStandbyMatch(bool enable) {
Result<void> Firewall::addRule(uint32_t uid, UidOwnerMatchType match, uint32_t iif) {
// iif should be non-zero if and only if match == MATCH_IIF
if (match == IIF_MATCH && iif == 0) {
return Errorf("Interface match {} must have nonzero interface index", match);
return Errorf("Interface match {} must have nonzero interface index",
static_cast<int>(match));
} else if (match != IIF_MATCH && iif != 0) {
return Errorf("Non-interface match {} must have zero interface index", match);
return Errorf("Non-interface match {} must have zero interface index",
static_cast<int>(match));
}
std::lock_guard guard(mMutex);