Changeset 39873 in vbox

Timestamp:

Jan 25, 2012 11:49:04 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75908

Message:

RTCString::find: made it more readable - 2 variable assignments in one if isn't cool.

File:

• trunk/src/VBox/Runtime/common/string/ministring.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -202 +202 @@
 size_t RTCString::find(const char *pcszFind, size_t pos /*= 0*/) const
 {
-    const char *pszThis, *p;
-
-    if (    ((pszThis = c_str()))
-         && (pos < length())
-         && ((p = strstr(pszThis + pos, pcszFind)))
-       )
-        return p - pszThis;
+    if (pos < length())
+    {
+        const char *pszThis = c_str();
+        if (pszThis)
+        {
+            const char *pszHit = strstr(pszThis, pcszFind);
+            if (pszHit)
+                return pszHit - pszThis;
+        }
+    }
 
     return npos;