trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1057975 - in /trafficserver/traffic/trunk: iocore/net/P_UDPNet.h iocore/net/P_UnixUDPConnection.h iocore/net/UnixUDPNet.cc lib/ts/ink_memory.cc proxy/mgmt2/web2/WebHttp.cc proxy/mgmt2/web2/WebIntrMain.cc
Date Wed, 12 Jan 2011 02:41:09 GMT
Author: igalic
Date: Wed Jan 12 02:41:09 2011
New Revision: 1057975

URL: http://svn.apache.org/viewvc?rev=1057975&view=rev
Log:
Cleanup code to fix errors with Clang's new -Wself-assign

Modified:
    trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
    trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h
    trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
    trafficserver/traffic/trunk/lib/ts/ink_memory.cc
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc

Modified: trafficserver/traffic/trunk/iocore/net/P_UDPNet.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UDPNet.h?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UDPNet.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UDPNet.h Wed Jan 12 02:41:09 2011
@@ -444,7 +444,7 @@ public:
   };
   ~UDPWorkContinuation() {
   };
-  void init(Continuation * c, int numPairs, unsigned int my_ip, unsigned int dest_ip, int
s_bufsize, int r_bufsize);
+  void init(Continuation * c, int num_pairs, unsigned int my_ip, unsigned int dest_ip, int
s_bufsize, int r_bufsize);
   int StateCreatePortPairs(int event, void *data);
   int StateDoCallback(int event, void *data);
 

Modified: trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixUDPConnection.h Wed Jan 12 02:41:09 2011
@@ -39,7 +39,7 @@
 class UnixUDPConnection:public UDPConnectionInternal
 {
 public:
-  void init(int fd);
+  void init(int the_fd);
   void setEthread(EThread * e);
   void errorAndDie(int e);
   int callbackHandler(int event, void *data);
@@ -54,7 +54,7 @@ public:
   EThread *ethread;
   EventIO ep;
 
-  UnixUDPConnection(int fd);
+  UnixUDPConnection(int the_fd);
   virtual ~ UnixUDPConnection();
 private:
   int m_errno;
@@ -62,22 +62,22 @@ private:
 };
 
 TS_INLINE
-UnixUDPConnection::UnixUDPConnection(int fd)
+UnixUDPConnection::UnixUDPConnection(int the_fd)
   : onCallbackQueue(0)
   , callbackAction(NULL)
   , ethread(NULL)
   , m_errno(0)
 {
-  fd = fd;
+  fd = the_fd;
   UDPPacketInternal p;
   ink_atomiclist_init(&inQueue, "Incoming UDP Packet queue", (char *) &p.alink.next
- (char *) &p);
   SET_HANDLER(&UnixUDPConnection::callbackHandler);
 }
 
 TS_INLINE void
-UnixUDPConnection::init(int fd)
+UnixUDPConnection::init(int the_fd)
 {
-  fd = fd;
+  fd = the_fd;
   onCallbackQueue = 0;
   callbackAction = NULL;
   ethread = NULL;

Modified: trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixUDPNet.cc Wed Jan 12 02:41:09 2011
@@ -1260,13 +1260,13 @@ UDPNetHandler::mainNetEvent(int event, E
 /////////////////////////////////////////////////////////////////////
 
 void
-UDPWorkContinuation::init(Continuation * c, int numPairs,
+UDPWorkContinuation::init(Continuation * c, int num_pairs,
                           unsigned int my_ip, unsigned int dest_ip, int s_bufsize, int r_bufsize)
 {
   mutex = c->mutex;
   cont = c;
   action = c;
-  numPairs = numPairs;
+  numPairs = num_pairs;
   myIP = my_ip;
   destIP = dest_ip;
   sendbufsize = s_bufsize;

Modified: trafficserver/traffic/trunk/lib/ts/ink_memory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/lib/ts/ink_memory.cc?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/lib/ts/ink_memory.cc (original)
+++ trafficserver/traffic/trunk/lib/ts/ink_memory.cc Wed Jan 12 02:41:09 2011
@@ -266,7 +266,7 @@ ink_memcpy(void *s1, const void *s2, int
       d[i + 6] = s[i + 6];
       d[i + 7] = s[i + 7];
     }
-    for (i = i; i < n; i++)
+    for (; i < n; i++)
       d[i] = s[i];
   } else {
     memcpy(s1, s2, n);

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Wed Jan 12 02:41:09 2011
@@ -2711,7 +2711,7 @@ signal_handler_do_nothing(int x)
 {
   //  A small function thats whole purpose is to give the signal
   //  handler for breaking out of a network read, somethng to call
-  x = x;
+  NOWARN_UNUSED(x);
 }
 
 int

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=1057975&r1=1057974&r2=1057975&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Wed Jan 12 02:41:09 2011
@@ -616,7 +616,7 @@ webIntr_main(void *x)
   int sleepTime = 2;
 #endif
   // No Warning
-  x = x;
+  NOWARN_UNUSED(x);
 
 #if !defined(linux)
   // Start by blocking all signals



Mime
View raw message