*** empty log message ***

1 files changed, 54 insertions, 60 deletions

diff --git a/ace/SString.i b/ace/SString.i
index f5354a68266..b4cc402c73c 100644
--- a/ace/SString.i
+++ b/ace/SString.i
@@ -87,25 +87,11 @@ ACE_CString::compare (const ACE_CString &s) const
 }
 
 ACE_INLINE int
-ACE_CString::strstr (const ACE_CString &s) const
-{
-  ACE_TRACE ("ACE_CString::strstr");
-
-  return this->find (s.rep_);
-}
-
-ACE_INLINE int
-ACE_CString::find (const ACE_CString &str, int pos) const
-{
-  return this->find (str.rep_, pos);
-}
-
-ACE_INLINE int
 ACE_CString::find (const char *s, int pos) const
 {
   char *substr = this->rep_ + pos;
   char *pointer = ACE_OS::strstr (substr, s);
-  if (pointer == NULL)
+  if (pointer == 0)
     return ACE_CString::npos;
   else
     return pointer - substr;
@@ -116,23 +102,35 @@ ACE_CString::find (char c, int pos) const
 {
   char *substr = this->rep_ + pos;
   char *pointer = ACE_OS::strchr (substr, c);
-  if (pointer == NULL)
+  if (pointer == 0)
     return ACE_CString::npos;
   else
     return pointer - substr;
 }
 
 ACE_INLINE int
+ACE_CString::find (const ACE_CString &str, int pos) const
+{
+  return this->find (str.rep_, pos);
+}
+
+ACE_INLINE int
+ACE_CString::strstr (const ACE_CString &s) const
+{
+  ACE_TRACE ("ACE_CString::strstr");
+
+  return this->find (s.rep_);
+}
+
+ACE_INLINE int
 ACE_CString::rfind (char c, int pos) const
 {
   if (pos == ACE_CString::npos)
     pos = this->len_;
 
   for (int i = pos - 1; i >= 0; i--)
-    {
-      if (this->rep_[i] == c)
-        return i;
-    }
+    if (this->rep_[i] == c)
+      return i;
 
   return ACE_CString::npos;
 }
@@ -222,25 +220,11 @@ ACE_SString::compare (const ACE_SString &s) const
 }
 
 ACE_INLINE int
-ACE_SString::strstr (const ACE_SString &s) const
-{
-  ACE_TRACE ("ACE_SString::strstr");
-
-  return this->find (s.rep_);
-}
-
-ACE_INLINE int
-ACE_SString::find (const ACE_SString &str, int pos) const
-{
-  return this->find (str.rep_, pos);
-}
-
-ACE_INLINE int
 ACE_SString::find (const char *s, int pos) const
 {
   char *substr = this->rep_ + pos;
   char *pointer = ACE_OS::strstr (substr, s);
-  if (pointer == NULL)
+  if (pointer == 0)
     return ACE_SString::npos;
   else
     return pointer - substr;
@@ -251,13 +235,27 @@ ACE_SString::find (char c, int pos) const
 {
   char *substr = this->rep_ + pos;
   char *pointer = ACE_OS::strchr (substr, c);
-  if (pointer == NULL)
+  if (pointer == 0)
     return ACE_SString::npos;
   else
     return pointer - substr;
 }
 
 ACE_INLINE int
+ACE_SString::strstr (const ACE_SString &s) const
+{
+  ACE_TRACE ("ACE_SString::strstr");
+
+  return this->find (s.rep_);
+}
+
+ACE_INLINE int
+ACE_SString::find (const ACE_SString &str, int pos) const
+{
+  return this->find (str.rep_, pos);
+}
+
+ACE_INLINE int
 ACE_SString::rfind (char c, int pos) const
 {
   if (pos == ACE_SString::npos)
@@ -306,7 +304,7 @@ ACE_WString::rep (void) const
       ACE_NEW_RETURN (t, ACE_USHORT16[this->len_ + 1], 0);
       ACE_OS::memcpy (t, this->rep_, this->len_ * sizeof (ACE_USHORT16));
 
-      // null terminate
+      // 0 terminate
       t[this->len_] = 0;
 
       return t;
@@ -377,25 +375,11 @@ ACE_WString::operator[] (size_t index)
 }
 
 ACE_INLINE int
-ACE_WString::strstr (const ACE_WString &s) const
-{
-  ACE_TRACE ("ACE_WString::strstr");
-
-  return this->find (s.rep_);
-}
-
-ACE_INLINE int
-ACE_WString::find (const ACE_WString &str, int pos) const
-{
-  return this->find (str.rep_, pos);
-}
-
-ACE_INLINE int
 ACE_WString::find (const ACE_USHORT16 *s, int pos) const
 {
   ACE_USHORT16 *substr = this->rep_ + pos;
   const ACE_USHORT16 *pointer = ACE_WString::strstr (substr, s);
-  if (pointer == NULL)
+  if (pointer == 0)
     return ACE_WString::npos;
   else
     return pointer - substr;
@@ -408,25 +392,35 @@ ACE_WString::find (ACE_USHORT16 c, int pos) const
     pos = this->len_;
 
   for (size_t i = pos; i < this->len_; i++)
-    {
-      if (this->rep_[i] == c)
-        return ACE_static_cast (int, i);
-    }
+    if (this->rep_[i] == c)
+      return ACE_static_cast (int, i);
 
   return ACE_WString::npos;
 }
 
 ACE_INLINE int
+ACE_WString::strstr (const ACE_WString &s) const
+{
+  ACE_TRACE ("ACE_WString::strstr");
+
+  return this->find (s.rep_);
+}
+
+ACE_INLINE int
+ACE_WString::find (const ACE_WString &str, int pos) const
+{
+  return this->find (str.rep_, pos);
+}
+
+ACE_INLINE int
 ACE_WString::rfind (ACE_USHORT16 c, int pos) const
 {
   if (pos == ACE_WString::npos)
     pos = this->len_;
 
   for (int i = pos - 1; i >= 0; i--)
-    {
-      if (this->rep_[i] == c)
-        return i;
-    }
+    if (this->rep_[i] == c)
+      return i;
 
   return ACE_WString::npos;
 }