svn commit: r1160602 - in /trafficserver/traffic/trunk: CHANGES iocore/cluster/ClusterHandler.cc proxy/logging/LogAccess.cc

[ig...@apache.org]

Author: igalic
Date: Tue Aug 23 10:07:51 2011
New Revision: 1160602

URL: http://svn.apache.org/viewvc?rev=1160602&view=rev
Log:
Compile would fail with --enable-purify. This patch makes sure it works again.
But, how useful is --enable-purify in the current state?
We're written a lot of code, but did we account for it to properly work under purify?

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
    trafficserver/traffic/trunk/proxy/logging/LogAccess.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1160602&r1=1160601&r2=1160602&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Tue Aug 23 10:07:51 2011
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.1.0
+  *) Make sure --enable-purify works again
+
   *) [TS-888] Fix SSL by enabling the right direction on successful setup.
 
   *) [TS-925] Switch from integer thread IDs to hex thread IDs with the

Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc?rev=1160602&r1=1160601&r2=1160602&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandler.cc Tue Aug 23 10:07:51 2011
@@ -1863,7 +1863,7 @@ ClusterHandler::add_small_controlmsg_des
     c->freeall();
     p = (char *) DOUBLE_ALIGN(p);
 #ifdef PURIFY
-    if ((unsigned int) endp < (unsigned int) p)
+    if ((uintptr_t) endp < (uintptr_t) p)
       memset(endp, 0, (p - endp));
 #endif
   }

Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=1160602&r1=1160601&r2=1160602&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Tue Aug 23 10:07:51 2011
@@ -726,7 +726,7 @@ LogAccess::marshal_record(char *record, 
   ink_memcpy(buf, out_buf, num_chars);
 
 #ifdef PURIFY
-  for (int i = num_chars + 1; i < max_chars; ++i) {
+  for (unsigned int i = num_chars + 1; i < max_chars; ++i) {
     buf[i] = '$';
   }
 #endif