osmetic changes.

1 files changed, 30 insertions, 36 deletions

diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 0325bbdff57..cc5ce9094d4 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -3,16 +3,16 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO
+//     TAO
 //
 // = FILENAME
-//    skip.cpp
+//     skip.cpp
 //
 // = DESCRIPTION
-//   Code for skipping different data types
+//     Code for skipping different data types
 //
-//   Data types encoded as CDR streams need to be skipped when they are part of
-//   an Any.
+//     Data types encoded as CDR streams need to be skipped when they are part of
+//     an Any.
 //
 // = AUTHOR
 //     Aniruddha Gokhale
@@ -81,8 +81,10 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
   else
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")));
+        ACE_DEBUG ((
+            LM_DEBUG,
+            ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
+          ));
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         CORBA::TypeCode::TRAVERSE_STOP);
@@ -91,8 +93,8 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
 
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                         TAO_InputCDR *stream,
-                         CORBA::Environment &ACE_TRY_ENV)
+                       TAO_InputCDR *stream,
+                       CORBA::Environment &ACE_TRY_ENV)
 {
   // Typecode of the element that makes the Any.
   CORBA::TypeCode_var elem_tc;
@@ -109,15 +111,10 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
 CORBA::TypeCode::traverse_status
 TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             TAO_InputCDR *stream,
-                            CORBA::Environment  &ACE_TRY_ENV)
+                            CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Boolean continue_skipping = 1;
 
-#if 0
-  // Typecode to be decoded.
-  CORBA::TypeCode_ptr *tcp;
-#endif /* 0 */
-
   // Typecode kind.
   CORBA::ULong kind;
 
@@ -194,20 +191,20 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
   else
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")));
+        ACE_DEBUG ((
+            LM_DEBUG,
+            ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
+          ));
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         CORBA::TypeCode::TRAVERSE_STOP);
     }
 }
 
-// Encode Principal.
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                               TAO_InputCDR *stream,
-                               CORBA::Environment &ACE_TRY_ENV)
+                             TAO_InputCDR *stream,
+                             CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::Boolean continue_skipping = 1;
 
@@ -225,8 +222,10 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
   else
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")));
+        ACE_DEBUG ((
+            LM_DEBUG,
+            ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
+          ));
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         CORBA::TypeCode::TRAVERSE_STOP);
@@ -241,7 +240,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
   CORBA::Boolean continue_skipping = 1;
 
   // return status
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
+  CORBA::TypeCode::traverse_status retval = 
+    CORBA::TypeCode::TRAVERSE_CONTINUE;
 
   // First, skip the type hint. This will be the type_id encoded in an
   // object reference.
@@ -285,19 +285,20 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
   else
     {
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")));
+        ACE_DEBUG ((
+            LM_DEBUG,
+            ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
+          ));
       ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
                                         CORBA::COMPLETED_MAYBE),
                         CORBA::TypeCode::TRAVERSE_STOP);
     }
 }
 
-// Decode structs.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream,
-                            CORBA::Environment &ACE_TRY_ENV)
+                          TAO_InputCDR *stream,
+                          CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::TypeCode::traverse_status retval =
     CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -331,7 +332,6 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
                     CORBA::TypeCode::TRAVERSE_STOP);
 }
 
-// Encode unions.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *src,
@@ -552,7 +552,6 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
                                            ACE_TRY_ENV);
 }
 
-// decode string
 CORBA::TypeCode::traverse_status
 TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream,
@@ -582,8 +581,6 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
     }
 }
 
-// Decode sequence.
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
                             TAO_InputCDR *stream,
@@ -635,8 +632,6 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
                     CORBA::TypeCode::TRAVERSE_STOP);
 }
 
-// Decode array.
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream,
@@ -676,7 +671,6 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                     CORBA::TypeCode::TRAVERSE_STOP);
 }
 
-// Decode alias.
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream,