ChangeLogTag:Mon Jul 17 17:49:41 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>

6 files changed, 26 insertions, 23 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 97756114183..3b21cf04246 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -5228,7 +5228,7 @@ TAO_Tokenizer::parse (const char *string, char delimiter)
 {
   ACE_CString new_string (string);
   u_int pos =0;
-  int slash_pos = 0;
+  ACE_CString::size_type slash_pos = 0;
   u_int count = 0;
   int result;
   while (pos < new_string.length ())
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 1525b981483..830f8fe5e98 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1160,7 +1160,7 @@ char *
 TAO_AV_Core::get_flowname (const char *flow_spec_entry_str)
 {
   ACE_CString flow_spec_entry (flow_spec_entry_str);
-  int slash_pos = flow_spec_entry.find ('\\');
+  ACE_CString::size_type slash_pos = flow_spec_entry.find ('\\');
   ACE_CString flow_name;
   if (slash_pos != flow_spec_entry.npos)
     flow_name = flow_spec_entry.substring (0, slash_pos);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 8d8cddc96f8..4d0bed9f1f8 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -832,18 +832,15 @@ TAO::HTIOP::Acceptor::parse_options (const char *str)
   //    `option1=foo'
   //    `option2=bar'
 
-  int begin = 0;
-  int end = -1;
+  ACE_CString::size_type begin = 0;
+  ACE_CString::size_type end = 0;
 
   for (CORBA::ULong j = 0; j < option_count; ++j)
     {
-      begin += end + 1;
-
       if (j < option_count - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = static_cast<CORBA::ULong> (len)
-          - begin;  // Handle last endpoint differently
+        end = len;
 
       if (end == begin)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -853,9 +850,9 @@ TAO::HTIOP::Acceptor::parse_options (const char *str)
         {
           ACE_CString opt = options.substring (begin, end);
 
-          int slot = opt.find ("=");
+          ACE_CString::size_type const slot = opt.find ("=");
 
-          if (slot == static_cast<int> (len - 1)
+          if (slot == len - 1
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) HTIOP option <%s> is ")
@@ -880,7 +877,11 @@ TAO::HTIOP::Acceptor::parse_options (const char *str)
                                ACE_TEXT ("(%P|%t) Invalid HTIOP option: <%s>\n"),
                                name.c_str ()),
                               -1);
+
+          begin = end + 1;
         }
+      else
+        break;  // No other options.
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index e8810ebd680..b729699e35e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -201,7 +201,7 @@ TAO_Container_i::lookup_i (const char *search_name
   ACE_TString section_name;
   int status = 0;
   int index = 0;
-  ssize_t pos = 0;
+  ACE_TString::size_type pos = 0;
   int so_far_so_good = 0;
   u_int kind = 0;
   CORBA::DefinitionKind def_kind = CORBA::dk_none;
@@ -2425,7 +2425,7 @@ TAO_Container_i::update_refs (const char *path,
                                                 "name",
                                                 ref_name);
 
-      ssize_t pos = ref_name.find (this->repo_->extension ());
+      ACE_TString::size_type pos = ref_name.find (this->repo_->extension ());
 
       // If one of the names has been mangled by move(), fix it.
       if (pos != ACE_TString::npos)
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index bfe70ce38fd..1b3377b9f19 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -282,7 +282,7 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
   // before the object key.
   for (size_t i = 0; i < len; ++i)
     if (options[i] == option_delimiter)
-      option_count++;
+      ++option_count;
 
   // The idea behind the following loop is to split the options into
   // (option, name) pairs.
@@ -292,17 +292,15 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
   //    `option1=foo'
   //    `option2=bar'
 
-  int begin = 0;
-  int end = -1;
+  ACE_CString::size_type begin = 0;
+  ACE_CString::size_type end = 0;
 
   for (CORBA::ULong j = 0; j < option_count; ++j)
     {
-      begin += end + 1;
-
       if (j < option_count - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = static_cast<int> (len - begin); // Handle last endpoint differently
+        end = len;
 
       if (end == begin)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -312,9 +310,9 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
         {
           ACE_CString opt = options.substring (begin, end);
 
-          int slot = opt.find ("=");
+          ACE_CString::size_type const slot = opt.find ("=");
 
-          if (slot == static_cast<int> (len - 1)
+          if (slot == len - 1
               || slot == ACE_CString::npos)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) UIPMC option <%s> is ")
@@ -344,7 +342,11 @@ TAO_UIPMC_Acceptor::parse_options (const char *str)
                                ACE_TEXT ("TAO (%P|%t) Invalid UIPMC option: <%s>\n"),
                                name.c_str ()),
                               -1);
+
+          begin = end + 1;
         }
+      else
+        break;  // No other options.
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 15b50afd698..d242aef76a1 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -275,7 +275,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   ACE_CString ace_str (string, 0, 0);
 
   // Look for the group domain delimitor.
-  ssize_t pos = ace_str.find ('-');
+  ACE_CString::size_type pos = ace_str.find ('-');
 
   if (pos == ACE_CString::npos)
     {
@@ -295,8 +295,8 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   // The group_id is terminated with a '-' or a '/'.
 
   // Skip past the last '-'.
-  pos++;
-  ssize_t end_pos = ace_str.find ('-',pos);
+  ++pos;
+  ACE_CString::size_type end_pos = ace_str.find ('-',pos);
 
   CORBA::Boolean parse_group_ref_version_flag = 0;