Changeset 16533 in vbox

Timestamp:

Feb 5, 2009 5:26:22 PM (16 years ago)

Author:

vboxsync

Message:

tstLinuxC.c: Do not attempt to free output arguments on failure. Using a '_' suffix -> Utf16, this is sample code and should be extra readable.

File:

• trunk/src/VBox/Main/cbinding/tstLinuxC.c (modified) (4 diffs)

trunk/src/VBox/Main/cbinding/tstLinuxC.c

@@ -301 +301 @@
 int main(int argc, char **argv)
 {
-    IVirtualBox *vbox      = NULL;
-    ISession  *session     = NULL;
-    PRUint32   revision    = 0;
-    PRUnichar *version_    = NULL;
-    PRUnichar *homefolder_ = NULL;
+    IVirtualBox *vbox           = NULL;
+    ISession  *session          = NULL;
+    PRUint32   revision         = 0;
+    PRUnichar *versionUtf16     = NULL;
+    PRUnichar *homefolderUtf16  = NULL;
     nsresult rc;     /* Result code of various function (method) calls. */
 
@@ -353 +353 @@
     /* 2. Version */
 
-    rc = vbox->vtbl->GetVersion(vbox, &version_);
+    rc = vbox->vtbl->GetVersion(vbox, &versionUtf16);
     if (NS_SUCCEEDED(rc))
     {
         char *version = NULL;
-        VBoxUtf16ToUtf8(version_, &version);    
+        VBoxUtf16ToUtf8(versionUtf16, &version);
         printf("\tVersion: %s\n", version);
         VBoxUtf8Free(version);
+        VBoxComUnallocMem(versionUtf16);
     }
     else
@@ -366 +367 @@
             argv[0], (unsigned)rc);
     }
-    VBoxComUnallocMem(version_);
 
     /* 3. Home Folder */
 
-    rc = vbox->vtbl->GetHomeFolder(vbox, &homefolder_);
+    rc = vbox->vtbl->GetHomeFolder(vbox, &homefolderUtf16);
     if (NS_SUCCEEDED(rc))
     {
         char *homefolder = NULL;
-        VBoxUtf16ToUtf8(homefolder_, &homefolder);
+        VBoxUtf16ToUtf8(homefolderUtf16, &homefolder);
         printf("\tHomeFolder: %s\n", homefolder);
         VBoxUtf8Free(homefolder);
+        VBoxComUnallocMem(homefolderUtf16);
     }
     else
@@ -383 +384 @@
             argv[0], (unsigned)rc);
     }
-    VBoxComUnallocMem(homefolder_);
 
     listVMs(vbox, session);