Changeset 20977 in vbox for trunk/src/VBox/Main/MediumImpl.cpp

Timestamp:

Jun 26, 2009 2:38:55 PM (15 years ago)

Author:

vboxsync

Message:

API: weed out NULL strings, as many clients cannot use them

File:

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

trunk/src/VBox/Main/MediumImpl.cpp

@@ -75 +75 @@
     AutoReadLock alock (this);
 
-    m.description.cloneTo (aDescription);
+    if (m.description.isEmpty())
+        Bstr("").cloneTo(aDescription);
+    else
+        m.description.cloneTo (aDescription);
 
     return S_OK;
@@ -199 +202 @@
     AutoReadLock alock (this);
 
-    m.lastAccessError.cloneTo (aLastAccessError);
+    if (m.lastAccessError.isEmpty())
+        Bstr("").cloneTo(aLastAccessError);
+    else
+        m.lastAccessError.cloneTo (aLastAccessError);
 
     return S_OK;
@@ -969 +975 @@
         /* if the image file is not accessible, it's not acceptable for the
          * newly opened media so convert this into an error */
-        if (!m.lastAccessError.isNull())
+        if (!m.lastAccessError.isEmpty())
             rc = setError (VBOX_E_FILE_ERROR, Utf8Str (m.lastAccessError));
     }