SourceFormat Enforcement

[thirdparty/squid.git] / src / auth / basic / UserRequest.cc

diff --git a/src/auth/basic/UserRequest.cc b/src/auth/basic/UserRequest.cc
index c447e0855c8ac1146818334b794d58aa8e42ff6e..af87012806fbb50f19c32ddb5b6f111f3f40981d 100644 (file)
--- a/src/auth/basic/UserRequest.cc
+++ b/src/auth/basic/UserRequest.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -50,7 +50,7 @@ Auth::Basic::UserRequest::credentialsStr()
 /* log a basic user in
  */
 void
-Auth::Basic::UserRequest::authenticate(HttpRequest * request, ConnStateData * conn, http_hdr_type type)
+Auth::Basic::UserRequest::authenticate(HttpRequest *, ConnStateData *, http_hdr_type)
 {
     assert(user() != NULL);
 
@@ -70,8 +70,6 @@ Auth::Basic::UserRequest::authenticate(HttpRequest * request, ConnStateData * co
     /* Decode now takes care of finding the AuthUser struct in the cache */
     /* after external auth occurs anyway */
     user()->expiretime = current_time.tv_sec;
-
-    return;
 }
 
 Auth::Direction
@@ -179,7 +177,7 @@ Auth::Basic::UserRequest::HandleReply(void *data, const Helper::Reply &reply)
 
     assert(basic_auth != NULL);
 
-    if (reply.result == Helper::ResultCode::Okay)
+    if (reply.result == Helper::Okay)
         basic_auth->credentials(Auth::Ok);
     else {
         basic_auth->credentials(Auth::Failed);
@@ -208,3 +206,4 @@ Auth::Basic::UserRequest::HandleReply(void *data, const Helper::Reply &reply)
 
     delete r;
 }
+