--------------------- PatchSet 4013 Date: 2007/01/25 09:26:59 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: formatting Members: src/ACLASN.h:1.5.6.3->1.5.6.4 src/ACLIP.cc:1.8.2.9->1.8.2.10 Index: squid3/src/ACLASN.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ACLASN.h,v retrieving revision 1.5.6.3 retrieving revision 1.5.6.4 diff -u -r1.5.6.3 -r1.5.6.4 --- squid3/src/ACLASN.h 5 Jan 2007 16:57:50 -0000 1.5.6.3 +++ squid3/src/ACLASN.h 25 Jan 2007 09:26:59 -0000 1.5.6.4 @@ -1,6 +1,6 @@ /* - * $Id: ACLASN.h,v 1.5.6.3 2007/01/05 16:57:50 hno Exp $ + * $Id: ACLASN.h,v 1.5.6.4 2007/01/25 09:26:59 amosjeffries Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -49,8 +49,6 @@ extern void asnRegisterWithCacheManager(CacheManager & manager); SQUIDCEXTERN void asnFreeMemory(void); - - class ACLASN : public ACLData { Index: squid3/src/ACLIP.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ACLIP.cc,v retrieving revision 1.8.2.9 retrieving revision 1.8.2.10 diff -u -r1.8.2.9 -r1.8.2.10 --- squid3/src/ACLIP.cc 24 Jan 2007 02:43:20 -0000 1.8.2.9 +++ squid3/src/ACLIP.cc 25 Jan 2007 09:26:59 -0000 1.8.2.10 @@ -1,5 +1,5 @@ /* - * $Id: ACLIP.cc,v 1.8.2.9 2007/01/24 02:43:20 amosjeffries Exp $ + * $Id: ACLIP.cc,v 1.8.2.10 2007/01/25 09:26:59 amosjeffries Exp $ * * DEBUG: section 28 Access Control * AUTHOR: Duane Wessels @@ -33,7 +33,6 @@ * Copyright (c) 2003, Robert Collins */ - #include "squid.h" #include "ACLIP.h" #include "ACLChecklist.h" @@ -95,7 +94,6 @@ b3[0] = '\0'; snprintf(buf, len, "%s%s%s", b1, b2, b3); - } /* @@ -115,6 +113,7 @@ int aclIpAddrNetworkCompare(acl_ip_data * const &p, acl_ip_data * const &q) { + struct IN_ADDR A = p->addr1; struct IN_ADDR B = q->addr1; @@ -195,9 +194,9 @@ memset(mask, 0xff, sizeof(*mask)); - if (!asc || !*asc) /* short-cut: done */ + if (!asc || !*asc) { - return 1; + return 1; }