Changeset 16378 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jan 29, 2009 4:51:48 PM (16 years ago)

Author:

vboxsync

Message:

string.cpp: !RT_SUCCESS -> RT_FAILURE, propsal for saving one memcpy+alloc/free.

File:

• trunk/src/VBox/Main/glue/string.cpp (modified) (3 diffs)

trunk/src/VBox/Main/glue/string.cpp

@@ -53 +53 @@
             size_t i = pos;
             while (*psz && i--)
-                if (!(RT_SUCCESS(RTStrGetCpEx(&psz, &cp))))
+                if (RT_FAILURE(RTStrGetCpEx(&psz, &cp)))
                     return ret;     // return empty string on bad encoding
 
@@ -65 +65 @@
                 i = n;
                 while (*psz && i--)
-                    if (!(RT_SUCCESS(RTStrGetCpEx(&psz, &cp))))
+                    if (RT_FAILURE(RTStrGetCpEx(&psz, &cp)))
                         return ret;     // return empty string on bad encoding
 
                 size_t len = psz - pFirst;
+#if 1
                 char *psz = (char*)RTMemAlloc(len + 1);
                 memcpy(psz, pFirst, len);
@@ -74 +75 @@
                 ret = psz;
                 RTMemFree(psz);
+#else /* A proposal that saves a memcpy and alloc/free: */
+                ret.alloc(len + 1);
+                memcpy(ret.str, pFirst, len);
+                ret.str[len] = '\0';
+#endif
             }
         }