--------------------- PatchSet 4654 Date: 2007/05/27 12:59:20 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Drop several debug lines slipped into prev update. Members: lib/IPAddress.cc:1.1.2.40->1.1.2.41 Index: squid3/lib/IPAddress.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Attic/IPAddress.cc,v retrieving revision 1.1.2.40 retrieving revision 1.1.2.41 diff -u -r1.1.2.40 -r1.1.2.41 --- squid3/lib/IPAddress.cc 27 May 2007 12:52:45 -0000 1.1.2.40 +++ squid3/lib/IPAddress.cc 27 May 2007 12:59:20 -0000 1.1.2.41 @@ -1,6 +1,6 @@ /* - * $Id: IPAddress.cc,v 1.1.2.40 2007/05/27 12:52:45 amosjeffries Exp $ + * $Id: IPAddress.cc,v 1.1.2.41 2007/05/27 12:59:20 amosjeffries Exp $ * * DEBUG: section 14 IP Storage and Handling * AUTHOR: Amos Jeffries @@ -836,15 +836,12 @@ */ char* IPAddress::NtoA(char* buf, const unsigned int blen, IPAddressType force) const { -printf("DEBUG: NtoA: asked for IPA (want-type=%d, stored-type=%d)\n", force, (m_Type & IPv64) ); // Ensure we have a buffer. if(buf == NULL) { -printf("ERROR: NtoA: given a NULL buffer.\n"); return NULL; } -printf("DEBUG: NtoA: clearing buffer (buf=%x, len=%d)\n", (unsigned int)buf, blen ); memset(buf,0,blen); if( (force & IPv64) && !(force & m_Type) ) { @@ -858,11 +855,9 @@ /* NP: CANNOT use IsIPv6() here as that is tuned to check for SPLIT-STACK actions */ /* Generic IPA display does not care what the system is. */ if( !(force & IPv4) && (m_Type & IPv6) ) { -printf("DEBUG: NtoA: making IPv6 (%d && %d)\n", (int)!(force & IPv4), (int)(m_Type & IPv6) ); inet_ntop(AF_INET6, &m_SocketAddr.sin6_addr, buf, blen); } else if ( !(force & IPv6) && IsIPv4() ) { -printf("DEBUG: NtoA: making IPv4 (%d && %d)\n", (int)!(force & IPv6), (int)IsIPv4() ); #if USE_IPV6 struct in_addr tmp; GetInAddr(tmp); @@ -872,7 +867,6 @@ #endif } else { -printf("ERROR: NtoA: Cannot format IPA in the desired format (want-type=%d, stored-type=%d)\n", force, (m_Type & IPv64) ); assert(false); } @@ -904,7 +898,6 @@ } /* return size of buffer now used */ -printf("DEBUG: ToHostname returns name of length=%d\n", (p-buf)); return (p - buf); }