From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 14 Mar 2014 09:26:31 +0000 (+1300)
Subject: Remove useless code after rev.13309
X-Git-Tag: SQUID_3_5_0_1~334
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e823bd0fe8c65a9ebe77068964e9d8116d94163;p=thirdparty%2Fsquid.git

Remove useless code after rev.13309

The state variables used to store and present the redirector and store_id
helper parameters is no longer necessary.

  Detected by Coverity Scan. Issue 1191964.
---

diff --git a/src/redirect.cc b/src/redirect.cc
index 1c7fd18ff3..671503ee70 100644
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -37,7 +37,6 @@
 #include "client_side_request.h"
 #include "comm/Connection.h"
 #include "fde.h"
-#include "fqdncache.h"
 #include "format/Format.h"
 #include "globals.h"
 #include "HttpRequest.h"
@@ -66,9 +65,6 @@ public:
     void *data;
     SBuf orig_url;
 
-    Ip::Address client_addr;
-    const char *client_ident;
-    const char *method_s;
     HLPCB *handler;
 
 private:
@@ -91,9 +87,6 @@ CBDATA_CLASS_INIT(RedirectStateData);
 RedirectStateData::RedirectStateData(const char *url) :
         data(NULL),
         orig_url(url),
-        client_addr(),
-        client_ident(NULL),
-        method_s(NULL),
         handler(NULL)
 {
 }
@@ -238,8 +231,6 @@ storeIdStats(StoreEntry * sentry)
 static void
 constructHelperQuery(const char *name, helper *hlp, HLPCB *replyHandler, ClientHttpRequest * http, HLPCB *handler, void *data, Format::Format *requestExtrasFmt)
 {
-    ConnStateData * conn = http->getConn();
-    const char *fqdn;
     char buf[MAX_REDIRECTOR_REQUEST_STRLEN];
     int sz;
     Http::StatusCode status;
@@ -248,48 +239,9 @@ constructHelperQuery(const char *name, helper *hlp, HLPCB *replyHandler, ClientH
      * the RedirectStateData for all the helpers.
      */
     RedirectStateData *r = new RedirectStateData(http->uri);
-    if (conn != NULL)
-        r->client_addr = conn->log_addr;
-    else
-        r->client_addr.setNoAddr();
-    r->client_ident = NULL;
-#if USE_AUTH
-    if (http->request->auth_user_request != NULL) {
-        r->client_ident = http->request->auth_user_request->username();
-        debugs(61, 5, HERE << "auth-user=" << (r->client_ident?r->client_ident:"NULL"));
-    }
-#endif
-
-    if (!r->client_ident && http->request->extacl_user.size() > 0) {
-        r->client_ident = http->request->extacl_user.termedBuf();
-        debugs(61, 5, HERE << "acl-user=" << (r->client_ident?r->client_ident:"NULL"));
-    }
-
-    if (!r->client_ident && conn != NULL && conn->clientConnection != NULL && conn->clientConnection->rfc931[0]) {
-        r->client_ident = conn->clientConnection->rfc931;
-        debugs(61, 5, HERE << "ident-user=" << (r->client_ident?r->client_ident:"NULL"));
-    }
-
-#if USE_SSL
-
-    if (!r->client_ident && conn != NULL && Comm::IsConnOpen(conn->clientConnection)) {
-        r->client_ident = sslGetUserEmail(fd_table[conn->clientConnection->fd].ssl);
-        debugs(61, 5, HERE << "ssl-user=" << (r->client_ident?r->client_ident:"NULL"));
-    }
-#endif
-
-    if (!r->client_ident)
-        r->client_ident = dash_str;
-
-    r->method_s = RequestMethodStr(http->request->method);
-
     r->handler = handler;
-
     r->data = cbdataReference(data);
 
-    if ((fqdn = fqdncache_gethostbyaddr(r->client_addr, 0)) == NULL)
-        fqdn = dash_str;
-
     static MemBuf requestExtras;
     requestExtras.reset();
     if (requestExtrasFmt)