From: Amos Jeffries Date: Thu, 27 May 2010 11:16:08 +0000 (-0600) Subject: Polished source-maintenance X-Git-Tag: SQUID_3_2_0_1~186 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d090e020b81845f3d7167fec3c08b9b6cf83e244;p=thirdparty%2Fsquid.git Polished source-maintenance --- diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index 4540d06370..70254fdb05 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -1,17 +1,13 @@ - * DEBUG: -none -none Common Removal Policy -none ETag parsing support -none FDE -none Generate squid.conf.default and cf_parser.cci -none Linked list functions (deprecated) -none LRU Removal Policy -none Memory Allocation -none Refcount allocator + +section -- CGI Cache Manager +section -- External DISKD process implementation. +section -- Refcount allocator +section -- Unlink Daemon +section -- WWW Client section 00 Announcement Server section 00 Client Database -section 00 Debug Routines section 00 DNS Resolver Daemon +section 00 Debug Routines section 00 Hash Tables section 00 UFS Store Dump Tool section 01 Main Loop @@ -54,14 +50,14 @@ section 21 Time Functions section 22 Refresh Calculation section 23 URL Parsing section 23 URL Scheme parsing -section 25 MiME Header Parsing section 25 MIME Parsing and Internal Icons +section 25 MiME Header Parsing section 26 Secure Sockets Layer Proxy section 27 Cache Announcer section 28 Access Control section 29 Authenticator -section 29 Negotiate Authenticator section 29 NTLM Authenticator +section 29 Negotiate Authenticator section 30 Ident (RFC 931) section 31 Hypertext Caching Protocol section 32 Asynchronous Disk I/O @@ -125,13 +121,14 @@ section 79 Squid-side Disk I/O functions. section 79 Storage Manager COSS Interface section 79 Storage Manager UFS Interface section 80 WCCP Support -section 81 aio_xxx() POSIX emulation on Windows section 81 CPU Profiling Routines section 81 Store HEAP Removal Policies +section 81 aio_xxx() POSIX emulation on Windows section 82 External ACL section 83 SSL accelerator support section 84 Helper process maintenance section 85 Client-side Request Routines +section 86 ESI Expressions section 86 ESI processing section 87 Client-side Stream routines. section 88 Client-side Reply Routines @@ -142,7 +139,5 @@ section 90 HTTP Cache Control Header section 90 Storage Manager Client-Side Interface section 92 Storage File System section 93 Adaptation -section 93 eCAP Interface section 93 ICAP (RFC 3507) Client -section -- External DISKD process implementation. -section -- Unlink Daemon +section 93 eCAP Interface diff --git a/include/RefCount.h b/include/RefCount.h index f648fe48cf..02db483b23 100644 --- a/include/RefCount.h +++ b/include/RefCount.h @@ -1,7 +1,7 @@ /* * $Id$ * - * DEBUG: none Refcount allocator + * DEBUG: section -- Refcount allocator * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ diff --git a/scripts/PerUser.pl b/scripts/PerUser.pl old mode 100644 new mode 100755 diff --git a/scripts/remove-cfg.sh b/scripts/remove-cfg.sh old mode 100644 new mode 100755 diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh old mode 100644 new mode 100755 index 3d5e73a024..9eca4b2c47 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -33,8 +33,10 @@ for FILENAME in `ls -1`; do *.h|*.c|*.cc|*.cci) + # + # Code Style formatting maintenance + # ${ROOT}/scripts/formater.pl ${FILENAME} - if test -e $FILENAME -a -e "$FILENAME.astylebak"; then md51=`cat $FILENAME| tr -d "\n \t\r" | $MD5`; md52=`cat $FILENAME.astylebak| tr -d "\n \t\r" | $MD5`; @@ -46,8 +48,24 @@ for FILENAME in `ls -1`; do else rm -f $FILENAME.astylebak fi - continue fi + + # + # DEBUG Section list maintenance + # + grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' >>${ROOT}/doc/debug-sections.tmp + + # + # File permissions maintenance. + # + chmod 644 ${FILENAME} + ;; + + *.pl|*.sh) + # + # File permissions maintenance. + # + chmod 755 ${FILENAME} ;; Makefile.am) @@ -60,20 +78,14 @@ for FILENAME in `ls -1`; do if test -d $FILENAME ; then cd $FILENAME - srcformat || exit 1 + srcformat ${ROOT} || exit 1 cd .. fi done } +echo "" >${ROOT}/doc/debug-sections.tmp srcformat || exit 1 - -# -# DEBUG Section listing maintenance -# -cat ${ROOT}/{compat,src,lib,include}/*{.,/*.,/*/*.,/*/*/*.}{h,c,cc,cci} 2>/dev/null \ - | grep " DEBUG:" \ - | sed -e 's/ \* DEBUG: //' \ - | sort -u \ - | sort -n >${ROOT}/doc/debug-sections.txt +sort -u <${ROOT}/doc/debug-sections.tmp | sort -n >${ROOT}/doc/debug-sections.txt +rm ${ROOT}/doc/debug-sections.tmp diff --git a/src/adaptation/ecap/ServiceRep.cc b/src/adaptation/ecap/ServiceRep.cc index 438392dc1f..8244accf17 100644 --- a/src/adaptation/ecap/ServiceRep.cc +++ b/src/adaptation/ecap/ServiceRep.cc @@ -94,7 +94,7 @@ void Adaptation::Ecap::ServiceRep::detach() { isDetached = true; } - + bool Adaptation::Ecap::ServiceRep::detached() const { return isDetached; @@ -121,7 +121,7 @@ Adaptation::Ecap::RegisterAdapterService(const Adaptation::Ecap::ServiceRep::Ada if (adapterService->uri() == (*s)->uri()) { *s = adapterService; debugs(93, 3, "updated eCAP module service: " << - adapterService->uri()); + adapterService->uri()); return; } } @@ -148,14 +148,14 @@ Adaptation::Ecap::CheckUnusedAdapterServices(const Adaptation::Services& cfgs) { typedef std::list::const_iterator ASCI; for (ASCI loaded = TheServices.begin(); loaded != TheServices.end(); - ++loaded) { + ++loaded) { bool found = false; for (Services::const_iterator cfged = cfgs.begin(); - cfged != cfgs.end() && !found; ++cfged) { + cfged != cfgs.end() && !found; ++cfged) { found = (*cfged)->cfg().uri == (*loaded)->uri().c_str(); } if (!found) debugs(93, 1, "Warning: loaded eCAP service has no matching " << - "ecap_service config option: " << (*loaded)->uri()); + "ecap_service config option: " << (*loaded)->uri()); } } diff --git a/src/adaptation/icap/ServiceRep.cc b/src/adaptation/icap/ServiceRep.cc index ee96ffe354..ff33f96e65 100644 --- a/src/adaptation/icap/ServiceRep.cc +++ b/src/adaptation/icap/ServiceRep.cc @@ -460,7 +460,7 @@ const char *Adaptation::Icap::ServiceRep::status() const void Adaptation::Icap::ServiceRep::detach() { debugs(93,3, HERE << "detaching ICAP service: " << cfg().uri << - ' ' << status()); + ' ' << status()); isDetached = true; } diff --git a/src/main.cc b/src/main.cc index cc20480c0c..3617f4146e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -753,7 +753,7 @@ mainReconfigureFinish(void *) #endif Adaptation::Config::Finalize(enableAdaptation); #endif - + #if ICAP_CLIENT icapLogOpen(); #endif diff --git a/test-suite/ESIExpressions.cc b/test-suite/ESIExpressions.cc index d7ccbf14eb..bf3c82fddd 100644 --- a/test-suite/ESIExpressions.cc +++ b/test-suite/ESIExpressions.cc @@ -2,7 +2,7 @@ /* * $Id$ * - * DEBUG: section 86 ESI Expressions + * DEBUG: section 86 ESI Expressions * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ diff --git a/test-suite/hash.c b/test-suite/hash.c index 0954aa4d05..aad95dc151 100644 --- a/test-suite/hash.c +++ b/test-suite/hash.c @@ -2,7 +2,7 @@ /* * $Id$ * - * DEBUG: section 0 Hash Tables + * DEBUG: section 00 Hash Tables * AUTHOR: Harvest Derived * * SQUID Web Proxy Cache http://www.squid-cache.org/ diff --git a/test-suite/refcount.cc b/test-suite/refcount.cc index c18d3df807..79aee79625 100644 --- a/test-suite/refcount.cc +++ b/test-suite/refcount.cc @@ -2,7 +2,7 @@ /* * $Id$ * - * DEBUG: section xx Refcount allocator + * DEBUG: section -- Refcount allocator * AUTHOR: Robert Collins * * SQUID Web Proxy Cache http://www.squid-cache.org/ diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index 93ea763cd0..54c7a2e8f0 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -1,5 +1,5 @@ /* - * DEBUG: section 0 CGI Cache Manager + * DEBUG: section -- CGI Cache Manager * AUTHOR: Duane Wessels * * SQUID Web Proxy Cache http://www.squid-cache.org/ diff --git a/tools/helper-mux.pl b/tools/helper-mux.pl old mode 100644 new mode 100755 diff --git a/tools/helper-ok-dying.pl b/tools/helper-ok-dying.pl old mode 100644 new mode 100755 diff --git a/tools/helper-ok.pl b/tools/helper-ok.pl old mode 100644 new mode 100755 diff --git a/tools/squidclient.cc b/tools/squidclient.cc index 2797bd0c65..5728414c5c 100644 --- a/tools/squidclient.cc +++ b/tools/squidclient.cc @@ -1,7 +1,7 @@ /* * $Id$ * - * DEBUG: section 0 WWW Client + * DEBUG: section -- WWW Client * AUTHOR: Harvest Derived * * SQUID Web Proxy Cache http://www.squid-cache.org/