From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Fri, 28 May 2010 04:17:13 +0000 (-0600)
Subject: Polished source-maintenance
X-Git-Tag: SQUID_3_1_4~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f4ed644659ab1bcafe6242612275b995ce6e9b2;p=thirdparty%2Fsquid.git

Polished source-maintenance
---

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 4540d06370..ae01621646 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
@@ -21,7 +17,6 @@ section 03    Configuration File Parsing
 section 03    Configuration Settings
 section 04    Error Generation
 section 05    Comm
-section 05    Listener Socket Handler
 section 05    Socket Functions
 section 06    Disk I/O Routines
 section 07    Multicast
@@ -54,14 +49,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,24 +120,21 @@ 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
-section 89    EUI-48 Lookup
-section 89    EUI-64 Handling
 section 89    NAT / IP Interception
 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 527ae4ff6b..57fdc6ab93 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/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 3c720b9bfc..9eca4b2c47
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -21,15 +21,22 @@ else
 fi
 
 ROOT=`bzr root`
+
+srcformat ()
+{
 PWD=`pwd`
+echo "FORMAT: ${PWD}..."
+
 for FILENAME in `ls -1`; do
 
     case ${FILENAME} in
 
     *.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`;
@@ -41,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)
@@ -55,17 +78,14 @@ for FILENAME in `ls -1`; do
 
     if test -d $FILENAME ; then
 	cd $FILENAME
-	$ROOT/scripts/srcformat.sh || exit 1
+	srcformat ${ROOT} || exit 1
 	cd ..
     fi
 
 done
+}
 
-#
-#  DEBUG Section listing maintenance
-#
-cat ${ROOT}/{compat,src,lib,include}/*{.,/*.,/*/*.,/*/*/*.}{c,cc,h} 2>/dev/null \
-	| grep " DEBUG:" \
-	| sed -e 's/ \* DEBUG: //' \
-	| sort -u \
-	| sort -n >${ROOT}/doc/debug-sections.txt
+echo "" >${ROOT}/doc/debug-sections.tmp
+srcformat || exit 1
+sort -u <${ROOT}/doc/debug-sections.tmp | sort -n >${ROOT}/doc/debug-sections.txt
+rm ${ROOT}/doc/debug-sections.tmp
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 f69dc0b1c3..72cc11a18b 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 656ef22554..89338b4324 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/squidclient.cc b/tools/squidclient.cc
index 586f99f862..e45496fad1 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/