From: Francesco Chemolli Date: Tue, 17 Nov 2009 16:56:02 +0000 (+0100) Subject: Fixed some cases of variable shadowing X-Git-Tag: SQUID_3_2_0_1~567 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=076df709f55936015ee00327e3b6586e1f9ec9f7;p=thirdparty%2Fsquid.git Fixed some cases of variable shadowing --- diff --git a/src/HttpRequestMethod.cc b/src/HttpRequestMethod.cc index 8f4c9d1901..d98f3a9f5c 100644 --- a/src/HttpRequestMethod.cc +++ b/src/HttpRequestMethod.cc @@ -152,10 +152,10 @@ HttpRequestMethod::AddExtension(const char *mstr) } void -HttpRequestMethod::Configure(SquidConfig &Config) +HttpRequestMethod::Configure(SquidConfig &cfg) { #if 0 /* extension methods obsolete now that we have METHOD_OTHER always enabled */ - wordlist *w = Config.ext_methods; + wordlist *w = cfg.ext_methods; while (w) { char *s; diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc index ef01973720..bf0add9313 100644 --- a/src/auth/digest/auth_digest.cc +++ b/src/auth/digest/auth_digest.cc @@ -1375,9 +1375,9 @@ AuthDigestUserRequest::module_start(RH * handler, void *data) r->auth_user_request = this; AUTHUSERREQUESTLOCK(r->auth_user_request, "r"); if (digestConfig.utf8) { - char user[1024]; - latin1_to_utf8(user, sizeof(user), digest_user->username()); - snprintf(buf, 8192, "\"%s\":\"%s\"\n", user, realm); + char userstr[1024]; + latin1_to_utf8(userstr, sizeof(userstr), digest_user->username()); + snprintf(buf, 8192, "\"%s\":\"%s\"\n", userstr, realm); } else { snprintf(buf, 8192, "\"%s\":\"%s\"\n", digest_user->username(), realm); } @@ -1385,7 +1385,7 @@ AuthDigestUserRequest::module_start(RH * handler, void *data) helperSubmit(digestauthenticators, buf, authenticateDigestHandleReply, r); } -DigestUser::DigestUser (AuthConfig *config) : AuthUser (config), HA1created (0) +DigestUser::DigestUser (AuthConfig *aConfig) : AuthUser (aConfig), HA1created (0) {} AuthUser * diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc index 78eb37b73d..948422083c 100644 --- a/src/auth/negotiate/auth_negotiate.cc +++ b/src/auth/negotiate/auth_negotiate.cc @@ -301,7 +301,7 @@ AuthNegotiateUserRequest::addHeader(HttpReply * rep, int accel) } void -AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type type, HttpRequest * request) +AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *rep, http_hdr_type reqType, HttpRequest * request) { AuthNegotiateUserRequest *negotiate_request; @@ -314,8 +314,8 @@ AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *re /* New request, no user details */ if (auth_user_request == NULL) { - debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << type << " header: 'Negotiate'"); - httpHeaderPutStrf(&rep->header, type, "Negotiate"); + debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << reqType << " header: 'Negotiate'"); + httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); if (!keep_alive) { /* drop the connection */ @@ -342,12 +342,12 @@ AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *re */ if (negotiate_request->server_blob) { - debugs(29, 9, "authenticateNegotiateFixErrorHeader: Sending type:" << type << " header: 'Negotiate " << negotiate_request->server_blob << "'"); - httpHeaderPutStrf(&rep->header, type, "Negotiate %s", negotiate_request->server_blob); + debugs(29, 9, "authenticateNegotiateFixErrorHeader: Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); + httpHeaderPutStrf(&rep->header, reqType, "Negotiate %s", negotiate_request->server_blob); safe_free(negotiate_request->server_blob); } else { debugs(29, 9, "authenticateNegotiateFixErrorHeader: Connection authenticated"); - httpHeaderPutStrf(&rep->header, type, "Negotiate"); + httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); } break; @@ -355,14 +355,14 @@ AuthNegotiateConfig::fixHeader(AuthUserRequest *auth_user_request, HttpReply *re case AUTHENTICATE_STATE_NONE: /* semantic change: do not drop the connection. * 2.5 implementation used to keep it open - Kinkie */ - debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << type << " header: 'Negotiate'"); - httpHeaderPutStrf(&rep->header, type, "Negotiate"); + debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << reqType << " header: 'Negotiate'"); + httpHeaderPutStrf(&rep->header, reqType, "Negotiate"); break; case AUTHENTICATE_STATE_IN_PROGRESS: /* we're waiting for a response from the client. Pass it the blob */ - debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << type << " header: 'Negotiate " << negotiate_request->server_blob << "'"); - httpHeaderPutStrf(&rep->header, type, "Negotiate %s", negotiate_request->server_blob); + debugs(29, 9, "AuthNegotiateConfig::fixHeader: Sending type:" << reqType << " header: 'Negotiate " << negotiate_request->server_blob << "'"); + httpHeaderPutStrf(&rep->header, reqType, "Negotiate %s", negotiate_request->server_blob); safe_free(negotiate_request->server_blob); break; @@ -801,7 +801,7 @@ NegotiateUser::deleteSelf() const delete this; } -NegotiateUser::NegotiateUser (AuthConfig *config) : AuthUser (config) +NegotiateUser::NegotiateUser (AuthConfig *aConfig) : AuthUser (aConfig) { proxy_auth_list.head = proxy_auth_list.tail = NULL; } diff --git a/src/cache_manager.cc b/src/cache_manager.cc index 164bb41907..fec0086866 100644 --- a/src/cache_manager.cc +++ b/src/cache_manager.cc @@ -288,9 +288,9 @@ CacheManager::Start(int fd, HttpRequest * request, StoreEntry * entry) if (CheckPassword(mgr) != 0) { /* build error message */ - ErrorState *err; + ErrorState *errState; HttpReply *rep; - err = errorCon(ERR_CACHE_MGR_ACCESS_DENIED, HTTP_UNAUTHORIZED, request); + errState = errorCon(ERR_CACHE_MGR_ACCESS_DENIED, HTTP_UNAUTHORIZED, request); /* warn if user specified incorrect password */ if (mgr->passwd) @@ -304,9 +304,9 @@ CacheManager::Start(int fd, HttpRequest * request, StoreEntry * entry) fd_table[fd].ipaddr << ": password needed for '" << mgr->action << "'" ); - rep = err->BuildHttpReply(); + rep = errState->BuildHttpReply(); - errorStateFree(err); + errorStateFree(errState); /* * add Authenticate header, use 'action' as a realm because diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc index 379fbe5a78..8e6d832acc 100644 --- a/src/client_side_reply.cc +++ b/src/client_side_reply.cc @@ -947,13 +947,13 @@ clientReplyContext::purgeDoPurgeHead(StoreEntry *newEntry) void clientReplyContext::traceReply(clientStreamNode * node) { - clientStreamNode *next = (clientStreamNode *)node->node.next->data; + clientStreamNode *nextNode = (clientStreamNode *)node->node.next->data; StoreIOBuffer localTempBuffer; assert(http->request->max_forwards == 0); createStoreEntry(http->request->method, request_flags()); - localTempBuffer.offset = next->readBuffer.offset + headers_sz; - localTempBuffer.length = next->readBuffer.length; - localTempBuffer.data = next->readBuffer.data; + localTempBuffer.offset = nextNode->readBuffer.offset + headers_sz; + localTempBuffer.length = nextNode->readBuffer.length; + localTempBuffer.data = nextNode->readBuffer.data; storeClientCopy(sc, http->storeEntry(), localTempBuffer, SendMoreData, this); http->storeEntry()->releaseRequest();