--------------------- PatchSet 9194 Date: 2009/08/23 15:49:20 Author: serassio Branch: nt Tag: (none) Log: Fix compile warning Members: src/SquidString.h:1.3.4.17->1.3.4.18 src/typedefs.h:1.16.2.36->1.16.2.37 src/auth/Gadgets.h:1.1.2.2->1.1.2.3 src/auth/digest/auth_digest.cc:1.6.2.47->1.6.2.48 src/auth/ntlm/auth_ntlm.cc:1.6.2.47->1.6.2.48 Index: squid3/src/SquidString.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/SquidString.h,v retrieving revision 1.3.4.17 retrieving revision 1.3.4.18 diff -u -r1.3.4.17 -r1.3.4.18 --- squid3/src/SquidString.h 3 May 2009 16:40:33 -0000 1.3.4.17 +++ squid3/src/SquidString.h 23 Aug 2009 15:49:20 -0000 1.3.4.18 @@ -1,5 +1,5 @@ /* - * $Id: SquidString.h,v 1.3.4.17 2009/05/03 16:40:33 serassio Exp $ + * $Id: SquidString.h,v 1.3.4.18 2009/08/23 15:49:20 serassio Exp $ * * DEBUG: section 67 String * AUTHOR: Duane Wessels @@ -41,6 +41,7 @@ #include #endif + /* squid string placeholder (for printf) */ #ifndef SQUIDSTRINGPH #define SQUIDSTRINGPH "%.*s" Index: squid3/src/typedefs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/typedefs.h,v retrieving revision 1.16.2.36 retrieving revision 1.16.2.37 diff -u -r1.16.2.36 -r1.16.2.37 --- squid3/src/typedefs.h 31 Jul 2009 20:07:03 -0000 1.16.2.36 +++ squid3/src/typedefs.h 23 Aug 2009 15:49:20 -0000 1.16.2.37 @@ -1,6 +1,6 @@ /* - * $Id: typedefs.h,v 1.16.2.36 2009/07/31 20:07:03 serassio Exp $ + * $Id: typedefs.h,v 1.16.2.37 2009/08/23 15:49:20 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -51,10 +51,6 @@ /// \ingroup AuthAPI -/// \deprecated Use AuthUserHashPointer instead. -typedef struct AuthUserHashPointer auth_user_hash_pointer; - -/// \ingroup AuthAPI /// \deprecated Use AuthUserIP instead. typedef struct AuthUserIP auth_user_ip_t; Index: squid3/src/auth/Gadgets.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/auth/Gadgets.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/src/auth/Gadgets.h 3 May 2009 16:40:35 -0000 1.1.2.2 +++ squid3/src/auth/Gadgets.h 23 Aug 2009 15:49:20 -0000 1.1.2.3 @@ -1,5 +1,5 @@ /* - * $Id: Gadgets.h,v 1.1.2.2 2009/05/03 16:40:35 serassio Exp $ + * $Id: Gadgets.h,v 1.1.2.3 2009/08/23 15:49:20 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -45,10 +45,8 @@ * This is used to link auth_users into the username cache. * Because some schemes may link in aliases to a user, * the link is not part of the AuthUser structure itself. - * - \todo Inheritance in a struct? this should be a class. */ -struct AuthUserHashPointer : public hash_link { +class AuthUserHashPointer : public hash_link { /* first two items must be same as hash_link */ public: Index: squid3/src/auth/digest/auth_digest.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/auth/digest/auth_digest.cc,v retrieving revision 1.6.2.47 retrieving revision 1.6.2.48 diff -u -r1.6.2.47 -r1.6.2.48 --- squid3/src/auth/digest/auth_digest.cc 3 May 2009 16:40:35 -0000 1.6.2.47 +++ squid3/src/auth/digest/auth_digest.cc 23 Aug 2009 15:49:21 -0000 1.6.2.48 @@ -1,5 +1,5 @@ /* - * $Id: auth_digest.cc,v 1.6.2.47 2009/05/03 16:40:35 serassio Exp $ + * $Id: auth_digest.cc,v 1.6.2.48 2009/08/23 15:49:21 serassio Exp $ * * DEBUG: section 29 Authenticator * AUTHOR: Robert Collins @@ -463,10 +463,10 @@ AuthUser *auth_user; debugs(29, 9, HERE << "Looking for user '" << username << "'"); - if (username && (usernamehash = static_cast < auth_user_hash_pointer * >(hash_lookup(proxy_auth_username_cache, username)))) { + if (username && (usernamehash = static_cast < AuthUserHashPointer * >(hash_lookup(proxy_auth_username_cache, username)))) { while ((usernamehash->user()->auth_type != AUTH_DIGEST) && (usernamehash->next)) - usernamehash = static_cast < auth_user_hash_pointer * >(usernamehash->next); + usernamehash = static_cast < AuthUserHashPointer * >(usernamehash->next); auth_user = NULL; @@ -488,7 +488,7 @@ AuthUser *auth_user; hash_first(proxy_auth_username_cache); - while ((usernamehash = ((auth_user_hash_pointer *) hash_next(proxy_auth_username_cache)))) { + while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) { auth_user = usernamehash->user(); if (strcmp(auth_user->config->type(), "digest") == 0) Index: squid3/src/auth/ntlm/auth_ntlm.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/auth/ntlm/auth_ntlm.cc,v retrieving revision 1.6.2.47 retrieving revision 1.6.2.48 diff -u -r1.6.2.47 -r1.6.2.48 --- squid3/src/auth/ntlm/auth_ntlm.cc 8 Aug 2009 07:35:17 -0000 1.6.2.47 +++ squid3/src/auth/ntlm/auth_ntlm.cc 23 Aug 2009 15:49:21 -0000 1.6.2.48 @@ -1,5 +1,5 @@ /* - * $Id: auth_ntlm.cc,v 1.6.2.47 2009/08/08 07:35:17 serassio Exp $ + * $Id: auth_ntlm.cc,v 1.6.2.48 2009/08/23 15:49:21 serassio Exp $ * * DEBUG: section 29 NTLM Authenticator * AUTHOR: Robert Collins, Henrik Nordstrom, Francesco Chemolli @@ -404,7 +404,7 @@ debugs(29, 4, "AuthNTLMUserRequest::authenticate: authenticated user " << ntlm_user->username()); /* see if this is an existing user with a different proxy_auth * string */ - auth_user_hash_pointer *usernamehash = static_cast(hash_lookup(proxy_auth_username_cache, ntlm_user->username())); + AuthUserHashPointer *usernamehash = static_cast(hash_lookup(proxy_auth_username_cache, ntlm_user->username())); AuthUser *local_auth_user = ntlm_request->user(); while (usernamehash && (usernamehash->user()->auth_type != AUTH_NTLM || strcmp(usernamehash->user()->username(), ntlm_user->username()) != 0)) usernamehash = static_cast(usernamehash->next);