ChangeLogTag: Sat Apr 5 13:02:32 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>

5 files changed, 50 insertions, 58 deletions

diff --git a/ACE/ChangeLog.iliyan-gestalt b/ACE/ChangeLog.iliyan-gestalt
index 5f77b7f28f7..30ac6d9b59f 100644
--- a/ACE/ChangeLog.iliyan-gestalt
+++ b/ACE/ChangeLog.iliyan-gestalt
@@ -1,3 +1,12 @@
+Sat Apr  5 13:02:32 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Repository.cpp:
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf_Tokens.h:
+        * ace/Svc_Conf_y.cpp:
+
+          Reformatting.
+
 Sat Apr  5 12:37:10 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * ace/Parse_Node.cpp:
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 034f2f88527..ee6c784df8f 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -175,22 +175,20 @@ ACE_Service_Repository::fini (void)
                         i,
                         this->total_size_));
         }
-
-          else
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] (%d) -> 0\n"),
-                        this,
-                        i,
-                        this->total_size_));
-        }
-
+      else
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] (%d) -> 0\n"),
+                    this,
+                    i,
+                    this->total_size_));
 #endif
 
       // Collect any errors.
       if (s != 0)
         retval += s->fini ();
 
-  return (retval == 0) ? 0 : -1;
+      return (retval == 0) ? 0 : -1;
+    }
 }
 
 // Close down all the services.
@@ -219,27 +217,25 @@ ACE_Service_Repository::close (void)
       // Delete services in reverse order.
       ACE_Service_Type *s =
         const_cast<ACE_Service_Type *> (this->service_vector_[i]);
-      // Delete services in reverse order.
-      ACE_Service_Type *s =
-        const_cast<ACE_Service_Type *> (this->service_vector_[i]);
 
 #ifndef ACE_NLOGGING
       if(ACE::debug ())
         {
           if (s == 0)
-        {
-          if (s == 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d] -> 0\n"),
-                        this,
-                        i));
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"),
-                          this,
-                          i,
-                          s->name (),
-                          s));
+            {
+              if (s == 0)
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d] -> 0\n"),
+                            this,
+                            i));
+              else
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"),
+                            this,
+                            i,
+                            s->name (),
+                            s));
+            }
         }
 #endif
       --this->current_size_;
@@ -280,21 +276,12 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[],
   size_t i;
 
   for (i = 0; i < this->current_size_; i++)
-<<<<<<< .working
     {
       if (this->service_vector_[i] != 0 // skip any empty slots
           && ACE_OS::strcmp (name,
                              this->service_vector_[i]->name ()) == 0)
         break;
     }
-=======
-    {
-      if (this->service_vector_[i] != 0 // skip any empty slots
-          && ACE_OS::strcmp (name,
-                        this->service_vector_[i]->name ()) == 0)
-      break;
->>>>>>> .merge-right.r81240
-    }
 
   if (i < this->current_size_)
     {
@@ -308,13 +295,15 @@ ACE_Service_Repository::find_i (const ACE_TCHAR name[],
 
       if (srp != 0)
         *srp = this->service_vector_[i];
+
       if (ignore_suspended
           && this->service_vector_[i]->active () == 0)
         return -2;
+
       return 0;
     }
-  else
-    return -1;
+
+  return -1;
 }
 
 
@@ -430,9 +419,9 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr)
         this->current_size_++;
         return_value = 0;
       }
-
+  }
 #ifndef ACE_NLOGGING
-    if (ACE::debug ())
+  if (ACE::debug ())
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("ACE (%P|%t) SR::insert - repo=%@ [%d] (%d),")
                 ACE_TEXT (" name=%s (%s) (type=%@, object=%@, active=%d)\n"),
diff --git a/ACE/ace/Svc_Conf.y b/ACE/ace/Svc_Conf.y
index 2652068a720..57734fd6a95 100644
--- a/ACE/ace/Svc_Conf.y
+++ b/ACE/ace/Svc_Conf.y
@@ -387,6 +387,7 @@ ace_get_module (ACE_Service_Type const * sr,
 }
 
 #if defined (SVC_CONF_Y_DEBUGGING)
+
 // Main driver program.
 
 int
diff --git a/ACE/ace/Svc_Conf_Tokens.h b/ACE/ace/Svc_Conf_Tokens.h
index 8e492a5afac..d52b66aeedc 100644
--- a/ACE/ace/Svc_Conf_Tokens.h
+++ b/ACE/ace/Svc_Conf_Tokens.h
@@ -1,4 +1,4 @@
-// $Id$
+// $Id:$
 #ifndef BISON_SVC_CONF_TAB_H
 # define BISON_SVC_CONF_TAB_H
 # define ACE_YYSTYPE_IS_DECLARED 1
diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp
index 5c5aa7a080e..207ffbbfd4c 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -1551,11 +1551,7 @@ ace_yyreduce:
   case 26:
 
     {
-<<<<<<< .working
     ;}
-=======
-            ;}
->>>>>>> .merge-right.r81240
     break;
 
   case 27:
@@ -1569,7 +1565,7 @@ ace_yyreduce:
       if (((ACE_Stream_Type *) sn->record (ACE_SVC_CONF_PARAM->config)->type ())->push (mt) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("Problem with static\n")));
+                      ACE_TEXT ("Problem with static\n")));
           ACE_SVC_CONF_PARAM->yyerrno++;
         }
     ;}
@@ -1613,7 +1609,7 @@ ace_yyreduce:
       if (!st || (mt != 0 && st->remove (mt) == -1))
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
+                      ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"),
                       module->name (),
                       stream->name ()));
           ACE_SVC_CONF_PARAM->yyerrno++;
@@ -1936,7 +1932,7 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, char const * s)
 #endif /* ACE_NLOGGING */
 
   ACE_ERROR ((LM_ERROR,
-              ACE_LIB_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"),
+              ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"),
               ace_yyerrno,
               ace_yylineno,
               ACE_TEXT_CHAR_TO_TCHAR (s)));
@@ -1960,10 +1956,10 @@ ace_get_module (ACE_Service_Type const * sr,
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("cannot locate Module_Type %s ")
-                  ACE_LIB_TEXT ("in STREAM_Type %s\n"),
+                  ACE_TEXT ("cannot locate Module_Type %s ")
+                  ACE_TEXT ("in STREAM_Type %s\n"),
                   svc_name,
-                  (sr ? sr->name () : ACE_LIB_TEXT ("(nil)"))));
+                  (sr ? sr->name () : ACE_TEXT ("(nil)"))));
       ++ace_yyerrno;
     }
 
@@ -1984,14 +1980,14 @@ ace_get_module (ACE_Service_Type const * sr,
     static_cast <ACE_Module_Type const *> (sv->type ());
 
   ACE_TCHAR const * const module_type_name =
-    (mt ? mt->name () : ACE_LIB_TEXT ("(nil)"));
+    (mt ? mt->name () : ACE_TEXT ("(nil)"));
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
+                  ACE_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
                   module_type_name,
-                  (sr ? sr->name () : ACE_LIB_TEXT ("(nil)"))));
+                  (sr ? sr->name () : ACE_TEXT ("(nil)"))));
       ++ace_yyerrno;
     }
 
@@ -2003,7 +1999,7 @@ ace_get_module (ACE_Service_Type const * sr,
   if (mp && ACE_OS::strcmp (mp->name (), module_type_name) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
+                  ACE_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
                   module_type_name,
                   mp->name ()));
       mp->name (module_type_name);
@@ -2013,6 +2009,7 @@ ace_get_module (ACE_Service_Type const * sr,
 }
 
 #if defined (SVC_CONF_Y_DEBUGGING)
+
 // Main driver program.
 
 int
@@ -2022,11 +2019,7 @@ main (int argc, char *argv[])
 
   // Try to reopen any filename argument to use ACE_YYIN.
   if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0)
-<<<<<<< .working
-    (void) ACE_OS::ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
-=======
     (void) ACE_OS::ACE_OS::fprintf (stderr, ACE_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
->>>>>>> .merge-right.r81240
 
   return ::ace_yyparse (&param);
 }