Changeset 31346 in vbox for trunk

Timestamp:

Aug 3, 2010 10:17:03 PM (14 years ago)

Author:

vboxsync

Message:

Main/HostImpl: Solaris DVD drive list fix.

File:

• trunk/src/VBox/Main/HostImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -2035 +2035 @@
                             di_devfs_path_free(pszMinorPath);
 
-                            char *pszSlice = solarisGetSliceFromPath(pszDevLinkPath);
-                            if (   pszSlice && !strcmp(pszSlice, "s2")
-                                && !strncmp(pszDevLinkPath, "/dev/rdsk", sizeof("/dev/rdsk") - 1))   /* We want only raw disks */
+                            if (pszDevLinkPath)
                             {
-                                /*
-                                 * We've got a fully qualified DVD drive. Add it to the list.
-                                 */
-                                PSOLARISDVD pDrive = (PSOLARISDVD)RTMemAllocZ(sizeof(SOLARISDVD));
-                                if (RT_LIKELY(pDrive))
+                                char *pszSlice = solarisGetSliceFromPath(pszDevLinkPath);
+                                if (   pszSlice && !strcmp(pszSlice, "s2")
+                                    && !strncmp(pszDevLinkPath, "/dev/rdsk", sizeof("/dev/rdsk") - 1))   /* We want only raw disks */
                                 {
-                                    RTStrPrintf(pDrive->szDescription, sizeof(pDrive->szDescription), "%s %s", pszVendor, pszProduct);
-                                    RTStrCopy(pDrive->szRawDiskPath, sizeof(pDrive->szRawDiskPath), pszDevLinkPath);
-                                    if (*ppDrives)
-                                        pDrive->pNext = *ppDrives;
-                                    *ppDrives = pDrive;
+                                    /*
+                                     * We've got a fully qualified DVD drive. Add it to the list.
+                                     */
+                                    PSOLARISDVD pDrive = (PSOLARISDVD)RTMemAllocZ(sizeof(SOLARISDVD));
+                                    if (RT_LIKELY(pDrive))
+                                    {
+                                        RTStrPrintf(pDrive->szDescription, sizeof(pDrive->szDescription), "%s %s", pszVendor, pszProduct);
+                                        RTStrCopy(pDrive->szRawDiskPath, sizeof(pDrive->szRawDiskPath), pszDevLinkPath);
+                                        if (*ppDrives)
+                                            pDrive->pNext = *ppDrives;
+                                        *ppDrives = pDrive;
+                                    }
                                 }
+                                free(pszDevLinkPath);
                             }
-                            free(pszDevLinkPath);
                         }
                     }