Changeset 16384 in vbox

Timestamp:

Jan 29, 2009 6:16:07 PM (16 years ago)

Author:

vboxsync

Message:

string.cpp: enable optimization

Location:

trunk

Files:

• include/VBox/com/string.h (modified) (2 diffs)
• src/VBox/Main/glue/string.cpp (modified) (1 diff)

trunk/include/VBox/com/string.h

@@ -126 +126 @@
 
     /**
-     *  Allocates memory for a string capable to store \a aSize - 1 characters
-     *  plus the terminating zero character. If \a aSize is zero, or if a
-     *  memory allocation error occurs, this object will become null.
+     *  Allocates memory for a string capable to store \a aSize - 1 characters;
+     *  in other words, aSize includes the terminating zero character. If \a aSize
+     *  is zero, or if a memory allocation error occurs, this object will become null.
      */
     Bstr &alloc (size_t aSize)
@@ -389 +389 @@
 
     /**
-     *  Allocates memory for a string capable to store \a aSize - 1 characters
-     *  plus the terminating zero character. If \a aSize is zero, or if a
-     *  memory allocation error occurs, this object will become null.
+     *  Allocates memory for a string capable to store \a aSize - 1 bytes (not characters!);
+     *  in other words, aSize includes the terminating zero character. If \a aSize
+     *  is zero, or if a memory allocation error occurs, this object will become null.
      */
     Utf8Str &alloc (size_t aSize)

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

@@ -68 +68 @@
                         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);
-                psz[len] = '\0';
-                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
+                size_t cbCopy = psz - pFirst;
+                ret.alloc(cbCopy + 1);
+                memcpy(ret.str, pFirst, cbCopy);
+                ret.str[cbCopy] = '\0';
             }
         }