Polished source-maintenance

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 4540d063706a6446c000b6c427a979d0c1d0cd64..70254fdb0529e6290ec32390a3afc91cc1df37a6 100644 (file)
--- 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 f648fe48cf8d7de65925ffe5267056ce3d3c9674..02db483b23e6073c9bb713221664fd66a0c76f6f 100644 (file)
--- 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 (file)
new mode 100755 (executable)

diff --git a/scripts/remove-cfg.sh b/scripts/remove-cfg.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
old mode 100644 (file)
new mode 100755 (executable)
index 3d5e73a..9eca4b2
--- 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 438392dc1f23bf64208a91a4ece0c4dac2618bb1..8244accf170db1cdcaa9290babd5594fcf41473d 100644 (file)
--- 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<ServiceRep::AdapterService>::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 ee96ffe35462f91ed8594e9f512cc5c4568f662f..ff33f96e65d6597e76fe896fc85824f65ca58272 100644 (file)
--- 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 cc20480c0c79e8dd453bcf8f3f45f54946546cc2..3617f4146e9d8f0ae859c50374999ff49a8ca59e 100644 (file)
--- 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 d7ccbf14eb2fd3a571647a0c55b83c07fc2f1a82..bf3c82fddd32b240e3787608e23499b709aa06b1 100644 (file)
--- 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 0954aa4d0513e9d2b3d324830311e3b49111bfb5..aad95dc151fc5f425c88b4efa6f547b4a98406ff 100644 (file)
--- 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 c18d3df8075676d39a462be06d769e7f336f42dd..79aee796256c27233633bed25d02a4c04c3f7859 100644 (file)
--- 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 93ea763cd0b664a21bf5768f01724cd171098672..54c7a2e8f0f20e23742bba0bba08b2ba93dc0abe 100644 (file)
--- 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 (file)
new mode 100755 (executable)

diff --git a/tools/helper-ok-dying.pl b/tools/helper-ok-dying.pl
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tools/helper-ok.pl b/tools/helper-ok.pl
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 2797bd0c654db400dbd73488c22426d5dbdbbf20..5728414c5c3ed49b05ce0ebbac6214d032243694 100644 (file)
--- 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/