svn commit: r1034781 - in /trafficserver/traffic/trunk/proxy: ICP.cc ICPConfig.cc InkAPITest.cc

[je...@apache.org]

Author: jesus
Date: Sat Nov 13 15:44:26 2010
New Revision: 1034781

URL: http://svn.apache.org/viewvc?rev=1034781&view=rev
Log:
I get a warning (-Werror error) for comparison of integers with different signedness.

This should be safe everywhere.

Modified:
    trafficserver/traffic/trunk/proxy/ICP.cc
    trafficserver/traffic/trunk/proxy/ICPConfig.cc
    trafficserver/traffic/trunk/proxy/InkAPITest.cc

Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=1034781&r1=1034780&r2=1034781&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Sat Nov 13 15:44:26 2010
@@ -900,7 +900,7 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
         s->_peer->writeAction = NULL;
         int len = completionUtil::getBytesTransferred(e);
 
-        if (len == ntohs(s->_rICPmsg->h.msglen)) {
+        if (len == (int)ntohs(s->_rICPmsg->h.msglen)) {
           ICP_INCREMENT_DYN_STAT(query_response_write_stat);
           s->_peer->LogSendMsg(s->_rICPmsg, &s->_sender);       // log query reply
         } else {

Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=1034781&r1=1034780&r2=1034781&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Sat Nov 13 15:44:26 2010
@@ -955,7 +955,7 @@ ParentSiblingPeer::ValidSender(struct so
   } else {
     // Make sure the sockaddr_in corresponds to this peer
     if ((GetIP()->s_addr == fr->sin_addr.s_addr)
-        && (GetPort() == ntohs(fr->sin_port))) {
+        && (GetPort() == (int)ntohs(fr->sin_port))) {
       return 1;                 // Sender is this peer
     } else {
       return 0;                 // Sender is not this peer
@@ -1090,7 +1090,7 @@ MultiCastPeer::ValidSender(struct sockad
   Peer *P = _next;
   while (P) {
     if ((P->GetIP()->s_addr == sa->sin_addr.s_addr)
-        && (P->GetPort() == ntohs(sa->sin_port))) {
+        && (P->GetPort() == (int)ntohs(sa->sin_port))) {
       return 1;
     } else {
       P = P->GetNext();

Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1034781&r1=1034780&r2=1034781&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Sat Nov 13 15:44:26 2010
@@ -2340,7 +2340,7 @@ checkHttpTxnClientRemotePortGet(SocketTe
 
   INKDebug(UTDBG_TAG, "Browser port = %x, Txn remote port = %x", browser_port, port);
 
-  if (ntohs(port) == browser_port) {
+  if ((int)ntohs(port) == browser_port) {
     SDK_RPRINT(test->regtest, "INKHttpTxnClientRemotePortGet", "TestCase1", TC_PASS, "ok");
     test->test_client_remote_port_get = true;
   } else {