Shorten file headers

18 files changed, 8 insertions, 21 deletions

diff --git a/ACE/ASNMP/examples/get/get.cpp b/ACE/ASNMP/examples/get/get.cpp
index 23aaf3e0f76..4ff1631196b 100644
--- a/ACE/ASNMP/examples/get/get.cpp
+++ b/ACE/ASNMP/examples/get/get.cpp
@@ -5,7 +5,6 @@
  *
  *  Sample application demonstrating synchronous Snmp::get API
  *  to access an SNMP Version 1 agent.
- *
  */
 //=============================================================================
 
diff --git a/ACE/ASNMP/examples/get/get_async.cpp b/ACE/ASNMP/examples/get/get_async.cpp
index 05035d757a3..cccc0e21123 100644
--- a/ACE/ASNMP/examples/get/get_async.cpp
+++ b/ACE/ASNMP/examples/get/get_async.cpp
@@ -4,7 +4,6 @@
  *
  *  Sample application demonstrating synchronous Snmp::get API
  *  to access an SNMP Version 1 agent.
- *
  */
 //=============================================================================
 
diff --git a/ACE/ASNMP/examples/next/next.cpp b/ACE/ASNMP/examples/next/next.cpp
index 843fc0caf40..999a6883cf6 100644
--- a/ACE/ASNMP/examples/next/next.cpp
+++ b/ACE/ASNMP/examples/next/next.cpp
@@ -5,7 +5,6 @@
  *
  *  Sample application demonstrating synchronous Snmp::get_next API
  *  to access an SNMP Version 1 agent.
- *
  */
 //=============================================================================
 
diff --git a/ACE/ASNMP/examples/set/set.cpp b/ACE/ASNMP/examples/set/set.cpp
index 8394e72e7a0..d2ba783f0c2 100644
--- a/ACE/ASNMP/examples/set/set.cpp
+++ b/ACE/ASNMP/examples/set/set.cpp
@@ -5,7 +5,6 @@
  *
  *  Sample application demonstrating synchronous Snmp::set API
  *  to update an oid in an SNMP Version 1 agent.
- *
  */
 //=============================================================================
 
diff --git a/ACE/ASNMP/examples/walk/walk.cpp b/ACE/ASNMP/examples/walk/walk.cpp
index 07a8c19e324..8215fe70a34 100644
--- a/ACE/ASNMP/examples/walk/walk.cpp
+++ b/ACE/ASNMP/examples/walk/walk.cpp
@@ -5,7 +5,6 @@
  *
  *  Sample application demonstrating synchronous Snmp::get, get_next API
  *  to access an SNMP Version 1 agent.
- *
  */
 //=============================================================================
 
diff --git a/ACE/ace/XML_Utils/XML_Typedefs.h b/ACE/ace/XML_Utils/XML_Typedefs.h
index c78391c7c13..7892f5bc44c 100644
--- a/ACE/ace/XML_Utils/XML_Typedefs.h
+++ b/ACE/ace/XML_Utils/XML_Typedefs.h
@@ -1,7 +1,7 @@
 /**
  * @file XML_Typedefs.h
  * @author William R. Otte <wotte@dre.vanderbilt.edu>
- * 
+ *
  * Typedefs from the XML Utilities.
  */
 #ifndef XML_TYPEDEFS_H
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index a815304c48b..98679878ca8 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -7,8 +7,6 @@
  * This config.h file is for version 4.0.x of the
  * Integrity RTOS with SCA from Green Hills Software
  * http://www.ghs.com/products/rtos/integrity.html
- *
- * 
  */
 
 #define ghs
diff --git a/ACE/bin/zap_svn_id.pl b/ACE/bin/zap_svn_id.pl
index 278a0299ef1..f5c1d8c04e8 100755
--- a/ACE/bin/zap_svn_id.pl
+++ b/ACE/bin/zap_svn_id.pl
@@ -61,6 +61,7 @@ BEGIN{undef $/;} s/\#         \n//smg;
 BEGIN{undef $/;} s/\*\* \n/\*\*\n/smg;
 BEGIN{undef $/;} s/\/\*\n\*\*\n\*\*\n/\/\*\n/smg;
 BEGIN{undef $/;} s/\/\* \n/\/\*\n/smg;
+BEGIN{undef $/;} s/ \* \n/ \*\n/smg;
 BEGIN{undef $/;} s/ \*  \n/ \*\n/smg;
 BEGIN{undef $/;} s/\*\n\*  \n\*\n/\*\n/smg;
 BEGIN{undef $/;} s/ \*\n \*\n \*\n/ \*\n/smg;
diff --git a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
index 47a2e418749..523144dab26 100644
--- a/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
+++ b/ACE/examples/Reactor/TP_Reactor/AcceptHandler.h
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
index 445cabb79ab..658ff40641b 100644
--- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.cpp
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
index a58729dcaae..fcd2b1dca9a 100644
--- a/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
+++ b/ACE/examples/Reactor/TP_Reactor/ReadHandler.h
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/examples/Reactor/TP_Reactor/client.cpp b/ACE/examples/Reactor/TP_Reactor/client.cpp
index 1b9ea2dcb85..3c1da8a3b99 100644
--- a/ACE/examples/Reactor/TP_Reactor/client.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/client.cpp
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/examples/Reactor/TP_Reactor/common.h b/ACE/examples/Reactor/TP_Reactor/common.h
index 9d5f204fca8..77d36ee41df 100644
--- a/ACE/examples/Reactor/TP_Reactor/common.h
+++ b/ACE/examples/Reactor/TP_Reactor/common.h
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/examples/Reactor/TP_Reactor/server.cpp b/ACE/examples/Reactor/TP_Reactor/server.cpp
index 62db969a8eb..86cc52c09b3 100644
--- a/ACE/examples/Reactor/TP_Reactor/server.cpp
+++ b/ACE/examples/Reactor/TP_Reactor/server.cpp
@@ -1,7 +1,7 @@
 /*
  * ACE reactor demonstration
  *
- * 
+ *
  * Date: 26-Jan-2006
  */
 
diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp
index 3e2d8a15e55..7bed897b796 100644
--- a/ACE/performance-tests/RPC/client.cpp
+++ b/ACE/performance-tests/RPC/client.cpp
@@ -1,5 +1,4 @@
 /*
- * 
  */
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
index 48d0dde4531..4716ef081c4 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/client.cpp
@@ -1,7 +1,5 @@
 /**
  * client for a reactor based connection establishment test using HTBP
- *
- * 
  */
 
 #include "ace/Log_Msg.h"
diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
index b7b7128426b..d2bc3bb661a 100644
--- a/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
+++ b/ACE/protocols/tests/HTBP/Reactor_Tests/server.cpp
@@ -1,7 +1,5 @@
 /**
  * server for a reactor based connection establishment test using HTBP
- *
- * 
  */
 
 #include "ace/Log_Msg.h"
diff --git a/ACE/protocols/tests/HTBP/ping/server.cpp b/ACE/protocols/tests/HTBP/ping/server.cpp
index 90df8abca1d..e0a52fba7eb 100644
--- a/ACE/protocols/tests/HTBP/ping/server.cpp
+++ b/ACE/protocols/tests/HTBP/ping/server.cpp
@@ -1,7 +1,5 @@
 /**
  * server for a basic connection establishment test using HTBP
- *
- * 
  */
 
 #include "ace/Log_Msg.h"