ChangeLogTag: Sat Apr 5 12:37:10 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>

6 files changed, 57 insertions, 17 deletions

diff --git a/ACE/ChangeLog.iliyan-gestalt b/ACE/ChangeLog.iliyan-gestalt
index 8afc0a021db..5f77b7f28f7 100644
--- a/ACE/ChangeLog.iliyan-gestalt
+++ b/ACE/ChangeLog.iliyan-gestalt
@@ -1,3 +1,13 @@
+Sat Apr  5 12:37:10 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Parse_Node.cpp:
+        * ace/Service_Repository.cpp:
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf_Tokens.h:
+        * ace/Svc_Conf_y.cpp:
+
+          Reformatting and eliminating ACE_LIB_TEXT
+
 Wed Apr  2 20:15:56 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * ace/Intrusive_Auto_Ptr.h:
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index 1504290c95f..f42311503a5 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -60,7 +60,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
       if (yyerrno != 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"),
+                      ACE_TEXT ("dynamic initialization failed for Module %s\n"),
                       module->name ()));
           ++yyerrno;
         }
@@ -73,7 +73,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
       if (st->push (mt) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ACE_LIB_TEXT ("dynamic initialization failed for Stream %s\n"),
+                      ACE_TEXT ("dynamic initialization failed for Stream %s\n"),
                       this->node_->name ()));
           ++yyerrno;
         }
diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp
index 7e6757f30b2..034f2f88527 100644
--- a/ACE/ace/Service_Repository.cpp
+++ b/ACE/ace/Service_Repository.cpp
@@ -176,12 +176,19 @@ ACE_Service_Repository::fini (void)
                         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;
 }
@@ -212,11 +219,16 @@ 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,
@@ -268,12 +280,21 @@ 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_)
     {
@@ -394,6 +415,8 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr)
 
             break;
           }
+
+        break;
       }
 
     // Adding an entry.
@@ -407,10 +430,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 a47e25e1abd..2652068a720 100644
--- a/ACE/ace/Svc_Conf.y
+++ b/ACE/ace/Svc_Conf.y
@@ -181,7 +181,7 @@ module
       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++;
         }
     }
@@ -216,7 +216,7 @@ module
       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++;
@@ -310,7 +310,7 @@ yyerror (int yyerrno, int 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"),
               yyerrno,
               yylineno,
               ACE_TEXT_CHAR_TO_TCHAR (s)));
@@ -334,10 +334,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)"))));
       ++yyerrno;
     }
 
@@ -358,14 +358,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)"))));
       ++yyerrno;
     }
 
@@ -377,7 +377,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);
@@ -396,7 +396,7 @@ main (int argc, char *argv[])
 
   // Try to reopen any filename argument to use YYIN.
   if (argc > 1 && (yyin = freopen (argv[1], "r", stdin)) == 0)
-    (void) ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
+    (void) ACE_OS::fprintf (stderr, ACE_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1);
 
   return ::yyparse (&param);
 }
diff --git a/ACE/ace/Svc_Conf_Tokens.h b/ACE/ace/Svc_Conf_Tokens.h
index d52b66aeedc..8e492a5afac 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 c319ac0cc73..5c5aa7a080e 100644
--- a/ACE/ace/Svc_Conf_y.cpp
+++ b/ACE/ace/Svc_Conf_y.cpp
@@ -1551,7 +1551,11 @@ ace_yyreduce:
   case 26:
 
     {
+<<<<<<< .working
     ;}
+=======
+            ;}
+>>>>>>> .merge-right.r81240
     break;
 
   case 27:
@@ -2018,7 +2022,11 @@ 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);
 }