Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d8d30f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix bugprone-branch-clone warnings"

parents 6283df0e 739957cd

PrivateDnsConfiguration.cpp

+2 −5
Original line number Diff line number Diff line
@@ -301,11 +301,8 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const ServerIdentity& i 
    }



    bool reevaluationStatus = NEEDS_REEVALUATION;

    if (success) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OFF) {

        reevaluationStatus = DONT_REEVALUATE;

    } else if (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation) {

    if (success || (mode->second == PrivateDnsMode::OFF) ||

        (mode->second == PrivateDnsMode::OPPORTUNISTIC && !isRevalidation)) {

        reevaluationStatus = DONT_REEVALUATE;

    }

res_send.cpp

+0 −2
Original line number Diff line number Diff line
@@ -1454,9 +1454,7 @@ int res_tls_send(const std::list<DnsTlsServer>& tlsServers, ResState* statp, con 
            // It's OPPORTUNISTIC mode,

            // hence it's not required to do anything because it'll fallback to UDP.

            case DnsTlsTransport::Response::network_error:

                [[fallthrough]];

            case DnsTlsTransport::Response::internal_error:

                [[fallthrough]];

            default:

                return -1;

        }