From: Amos Jeffries Date: Tue, 20 Dec 2016 10:21:21 +0000 (+1300) Subject: Remove some unnecessary nullptr on changed lines X-Git-Tag: M-staged-PR71~333^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb41ef910fdf55af8f31f528d859d21d225a8a57;p=thirdparty%2Fsquid.git Remove some unnecessary nullptr on changed lines --- diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc index f03f8268b7..b2d6f6a325 100644 --- a/src/auth/Gadgets.cc +++ b/src/auth/Gadgets.cc @@ -112,11 +112,11 @@ authenticateCachedUsersList() }; std::vector v1, v2, rv, u1, u2; #if HAVE_AUTH_MODULE_BASIC - if (Auth::SchemeConfig::Find("basic") != nullptr) + if (Auth::SchemeConfig::Find("basic")) u1 = Auth::Basic::User::Cache()->sortedUsersList(); #endif #if HAVE_AUTH_MODULE_DIGEST - if (Auth::SchemeConfig::Find("digest") != nullptr) + if (Auth::SchemeConfig::Find("digest")) u2 = Auth::Digest::User::Cache()->sortedUsersList(); #endif if (u1.size() > 0 || u2.size() > 0) { @@ -127,11 +127,11 @@ authenticateCachedUsersList() u2.clear(); } #if HAVE_AUTH_MODULE_NEGOTIATE - if (Auth::SchemeConfig::Find("negotiate") != nullptr) + if (Auth::SchemeConfig::Find("negotiate")) u1 = Auth::Negotiate::User::Cache()->sortedUsersList(); #endif #if HAVE_AUTH_MODULE_NTLM - if (Auth::SchemeConfig::Find("ntlm") != nullptr) + if (Auth::SchemeConfig::Find("ntlm")) u2 = Auth::Ntlm::User::Cache()->sortedUsersList(); #endif if (u1.size() > 0 || u2.size() > 0) {