Imported Upstream version 15.0.0

[platform/upstream/libzypp.git] / zypp / media / CredentialManager.cc

diff --git a/zypp/media/CredentialManager.cc b/zypp/media/CredentialManager.cc
index 9e52d2e..4ff8dc1 100644 (file)
--- a/zypp/media/CredentialManager.cc
+++ b/zypp/media/CredentialManager.cc
@@ -39,17 +39,23 @@ namespace zypp
   //
   //////////////////////////////////////////////////////////////////////
 
-  bool AuthDataComparator::operator()( const AuthData_Ptr & lhs, const AuthData_Ptr & rhs )
+  bool
+  AuthDataComparator::operator()(
+      const AuthData_Ptr & lhs, const AuthData_Ptr & rhs)
   {
-    static const url::ViewOption vopt = url::ViewOption::DEFAULTS
-                                     - url::ViewOption::WITH_USERNAME
-                                     - url::ViewOption::WITH_PASSWORD
-                                     - url::ViewOption::WITH_QUERY_STR;
-    // std::less semantic!
-    int cmp = lhs->url().asString(vopt).compare( rhs->url().asString(vopt) );
-    if ( ! cmp )
-      cmp = lhs->username().compare( rhs->username() );
-    return( cmp < 0 );
+    static const url::ViewOption vopt =
+        url::ViewOption::DEFAULTS
+        - url::ViewOption::WITH_USERNAME
+        - url::ViewOption::WITH_PASSWORD
+        - url::ViewOption::WITH_QUERY_STR;
+
+    if (lhs->username() != rhs->username())
+      return true;
+
+    if (lhs->url().asString(vopt) != rhs->url().asString(vopt))
+      return true;
+
+    return false;
   }
 
   //////////////////////////////////////////////////////////////////////