svn commit: r1085544 - in /trafficserver/traffic/trunk/proxy/http/remap: UrlMapping.h UrlRewrite.cc

[zw...@apache.org]

Author: zwoop
Date: Fri Mar 25 19:57:08 2011
New Revision: 1085544

URL: http://svn.apache.org/viewvc?rev=1085544&view=rev
Log:
Tiny cleanup

Modified:
    trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h
    trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc

Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h?rev=1085544&r1=1085543&r2=1085544&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h Fri Mar 25 19:57:08 2011
@@ -105,13 +105,13 @@ public:
   bool negative_referer;
   bool wildcard_from_scheme;    // from url is '/foo', only http or https for now
   char *tag;                    // tag
-  char *filter_redirect_url;    // redirect url
+  char *filter_redirect_url;    // redirect url when referer filtering enabled
   unsigned int map_id;
   referer_info *referer_list;
   redirect_tag_str *redir_chunk_list;
   acl_filter_rule *filter;      // acl filtering (list of rules)
   unsigned int _plugin_count;
-  LINK(url_mapping, link);
+  LINK(url_mapping, link); // For use with the Queue linked list
 
   int getRank() const { return _rank; };
 
@@ -128,14 +128,10 @@ private:
 
 class UrlMappingContainer {
 public:
-  UrlMappingContainer()
-    : _mapping(NULL), _toURLPtr(NULL), _heap(NULL)
+ UrlMappingContainer()
+   : _mapping(NULL), _toURLPtr(NULL), _heap(NULL)
     { }
 
-  UrlMappingContainer(url_mapping *m)
-    : _heap(NULL)
-    { set(m); }
-
   UrlMappingContainer(HdrHeap *heap)
     : _mapping(NULL), _toURLPtr(NULL), _heap(heap)
   { }

Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc?rev=1085544&r1=1085543&r2=1085544&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc Fri Mar 25 19:57:08 2011
@@ -1291,10 +1291,8 @@ UrlRewrite::BuildTable()
             char refinfo_error_buf[1024];
             bool refinfo_error = false;
 
-            ri =
-              NEW(new
-                  referer_info((char *) bti.paramv[j - 1], &refinfo_error, refinfo_error_buf,
-                               sizeof(refinfo_error_buf)));
+            ri = NEW(new referer_info((char *) bti.paramv[j - 1], &refinfo_error, refinfo_error_buf,
+                                      sizeof(refinfo_error_buf)));
             if (refinfo_error) {
               snprintf(errBuf, sizeof(errBuf), "%s Incorrect Referer regular expression \"%s\" at line %d - %s",
                            modulePrefix, bti.paramv[j - 1], cln + 1, refinfo_error_buf);