Changeset 21436 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jul 9, 2009 12:24:28 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 49831
- Location:
- trunk/src/VBox/Main
- Files:
-
- 4 edited
-
HostImpl.cpp (modified) (2 diffs)
-
include/HostHardwareLinux.h (modified) (5 diffs)
-
linux/HostHardwareLinux.cpp (modified) (11 diffs)
-
testcase/tstHostHardwareLinux.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/HostImpl.cpp
r21431 r21436 315 315 std::list <ComObjPtr <HostDVDDrive> > list; 316 316 HRESULT rc = S_OK; 317 317 try 318 { 318 319 #if defined(RT_OS_WINDOWS) 319 int sz = GetLogicalDriveStrings(0, NULL);320 TCHAR *hostDrives = new TCHAR[sz+1];321 GetLogicalDriveStrings(sz, hostDrives);322 wchar_t driveName[3] = { '?', ':', '\0' };323 TCHAR *p = hostDrives;324 do325 {326 if (GetDriveType(p) == DRIVE_CDROM)327 {328 driveName[0] = *p;329 ComObjPtr <HostDVDDrive> hostDVDDriveObj;330 hostDVDDriveObj.createObject();331 hostDVDDriveObj->init (Bstr (driveName));332 list.push_back (hostDVDDriveObj);333 }334 p += _tcslen(p) + 1;335 }336 while (*p);337 delete[] hostDrives;320 int sz = GetLogicalDriveStrings(0, NULL); 321 TCHAR *hostDrives = new TCHAR[sz+1]; 322 GetLogicalDriveStrings(sz, hostDrives); 323 wchar_t driveName[3] = { '?', ':', '\0' }; 324 TCHAR *p = hostDrives; 325 do 326 { 327 if (GetDriveType(p) == DRIVE_CDROM) 328 { 329 driveName[0] = *p; 330 ComObjPtr <HostDVDDrive> hostDVDDriveObj; 331 hostDVDDriveObj.createObject(); 332 hostDVDDriveObj->init (Bstr (driveName)); 333 list.push_back (hostDVDDriveObj); 334 } 335 p += _tcslen(p) + 1; 336 } 337 while (*p); 338 delete[] hostDrives; 338 339 339 340 #elif defined(RT_OS_SOLARIS) 340 341 # ifdef VBOX_USE_LIBHAL 341 if (!getDVDInfoFromHal(list))342 if (!getDVDInfoFromHal(list)) 342 343 # endif 343 // Not all Solaris versions ship with libhal. 344 // So use a fallback approach similar to Linux. 345 { 346 if (RTEnvGet("VBOX_CDROM")) 347 { 348 char *cdromEnv = strdup(RTEnvGet("VBOX_CDROM")); 349 char *cdromDrive; 350 cdromDrive = strtok(cdromEnv, ":"); /** @todo use strtok_r. */ 351 while (cdromDrive) 344 // Not all Solaris versions ship with libhal. 345 // So use a fallback approach similar to Linux. 346 { 347 if (RTEnvGet("VBOX_CDROM")) 352 348 { 353 if (validateDevice(cdromDrive, true)) 349 char *cdromEnv = strdup(RTEnvGet("VBOX_CDROM")); 350 char *cdromDrive; 351 cdromDrive = strtok(cdromEnv, ":"); /** @todo use strtok_r. */ 352 while (cdromDrive) 353 { 354 if (validateDevice(cdromDrive, true)) 355 { 356 ComObjPtr <HostDVDDrive> hostDVDDriveObj; 357 hostDVDDriveObj.createObject(); 358 hostDVDDriveObj->init (Bstr (cdromDrive)); 359 list.push_back (hostDVDDriveObj); 360 } 361 cdromDrive = strtok(NULL, ":"); 362 } 363 free(cdromEnv); 364 } 365 else 366 { 367 // this might work on Solaris version older than Nevada. 368 if (validateDevice("/cdrom/cdrom0", true)) 354 369 { 355 370 ComObjPtr <HostDVDDrive> hostDVDDriveObj; 356 371 hostDVDDriveObj.createObject(); 357 hostDVDDriveObj->init (Bstr ( cdromDrive));372 hostDVDDriveObj->init (Bstr ("cdrom/cdrom0")); 358 373 list.push_back (hostDVDDriveObj); 359 374 } 360 cdromDrive = strtok(NULL, ":"); 375 376 // check the mounted drives 377 parseMountTable(MNTTAB, list); 361 378 } 362 free(cdromEnv);363 } 364 else 365 {366 // this might work on Solaris version older than Nevada.367 if (validateDevice("/cdrom/cdrom0", true))379 } 380 381 #elif defined(RT_OS_LINUX) 382 if (RT_SUCCESS (mHostDrives.updateDVDs())) 383 for (DriveInfoList::const_iterator it = mHostDrives.DVDBegin(); 384 SUCCEEDED (rc) && it != mHostDrives.DVDEnd(); ++it) 368 385 { 369 ComObjPtr <HostDVDDrive> hostDVDDriveObj; 370 hostDVDDriveObj.createObject(); 371 hostDVDDriveObj->init (Bstr ("cdrom/cdrom0")); 372 list.push_back (hostDVDDriveObj); 386 ComObjPtr<HostDVDDrive> hostDVDDriveObj; 387 Bstr device(it->mDevice); 388 Bstr udi(it->mUdi); 389 Bstr description(it->mDescription); 390 if (SUCCEEDED (rc)) 391 rc = hostDVDDriveObj.createObject(); 392 if (SUCCEEDED (rc)) 393 rc = hostDVDDriveObj->init (device, udi, description); 394 if (SUCCEEDED (rc)) 395 list.push_back(hostDVDDriveObj); 373 396 } 374 375 // check the mounted drives 376 parseMountTable(MNTTAB, list); 377 } 378 } 379 380 #elif defined(RT_OS_LINUX) 381 if (RT_SUCCESS (mHostDrives.updateDVDs())) 382 for (DriveInfoList::const_iterator it = mHostDrives.DVDBegin(); 383 SUCCEEDED (rc) && it != mHostDrives.DVDEnd(); ++it) 397 #elif defined(RT_OS_DARWIN) 398 PDARWINDVD cur = DarwinGetDVDDrives(); 399 while (cur) 384 400 { 385 401 ComObjPtr<HostDVDDrive> hostDVDDriveObj; 386 Bstr device (it->mDevice.c_str()); 387 Bstr udi (it->mUdi.empty() ? NULL : it->mUdi.c_str()); 388 Bstr description (it->mDescription.empty() ? NULL : it->mDescription.c_str()); 389 if (device.isNull() || (!it->mUdi.empty() && udi.isNull()) || 390 (!it->mDescription.empty() && description.isNull())) 391 rc = E_OUTOFMEMORY; 392 if (SUCCEEDED (rc)) 393 rc = hostDVDDriveObj.createObject(); 394 if (SUCCEEDED (rc)) 395 rc = hostDVDDriveObj->init (device, udi, description); 396 if (SUCCEEDED (rc)) 397 list.push_back(hostDVDDriveObj); 398 } 399 #elif defined(RT_OS_DARWIN) 400 PDARWINDVD cur = DarwinGetDVDDrives(); 401 while (cur) 402 { 403 ComObjPtr<HostDVDDrive> hostDVDDriveObj; 404 hostDVDDriveObj.createObject(); 405 hostDVDDriveObj->init(Bstr(cur->szName)); 406 list.push_back(hostDVDDriveObj); 407 408 /* next */ 409 void *freeMe = cur; 410 cur = cur->pNext; 411 RTMemFree(freeMe); 412 } 402 hostDVDDriveObj.createObject(); 403 hostDVDDriveObj->init(Bstr(cur->szName)); 404 list.push_back(hostDVDDriveObj); 405 406 /* next */ 407 void *freeMe = cur; 408 cur = cur->pNext; 409 RTMemFree(freeMe); 410 } 413 411 #elif defined(RT_OS_FREEBSD) 414 412 # ifdef VBOX_USE_LIBHAL 415 if (!getDVDInfoFromHal(list))413 if (!getDVDInfoFromHal(list)) 416 414 # endif 417 {418 /** @todo: Scan for accessible /dev/cd* devices. */419 }415 { 416 /** @todo: Scan for accessible /dev/cd* devices. */ 417 } 420 418 #else 421 419 /* PORTME */ 422 420 #endif 423 421 424 SafeIfaceArray <IHostDVDDrive> array (list); 425 array.detachTo(ComSafeArrayOutArg(aDrives)); 422 SafeIfaceArray <IHostDVDDrive> array (list); 423 array.detachTo(ComSafeArrayOutArg(aDrives)); 424 } 425 catch(std::bad_alloc &e) 426 { 427 rc = E_OUTOFMEMORY; 428 } 426 429 return rc; 427 430 } … … 442 445 HRESULT rc = S_OK; 443 446 447 try 448 { 444 449 #ifdef RT_OS_WINDOWS 445 int sz = GetLogicalDriveStrings(0, NULL);446 TCHAR *hostDrives = new TCHAR[sz+1];447 GetLogicalDriveStrings(sz, hostDrives);448 wchar_t driveName[3] = { '?', ':', '\0' };449 TCHAR *p = hostDrives;450 do451 {452 if (GetDriveType(p) == DRIVE_REMOVABLE)453 {454 driveName[0] = *p;455 ComObjPtr <HostFloppyDrive> hostFloppyDriveObj;456 hostFloppyDriveObj.createObject();457 hostFloppyDriveObj->init (Bstr (driveName));458 list.push_back (hostFloppyDriveObj);459 }460 p += _tcslen(p) + 1;461 }462 while (*p);463 delete[] hostDrives;450 int sz = GetLogicalDriveStrings(0, NULL); 451 TCHAR *hostDrives = new TCHAR[sz+1]; 452 GetLogicalDriveStrings(sz, hostDrives); 453 wchar_t driveName[3] = { '?', ':', '\0' }; 454 TCHAR *p = hostDrives; 455 do 456 { 457 if (GetDriveType(p) == DRIVE_REMOVABLE) 458 { 459 driveName[0] = *p; 460 ComObjPtr <HostFloppyDrive> hostFloppyDriveObj; 461 hostFloppyDriveObj.createObject(); 462 hostFloppyDriveObj->init (Bstr (driveName)); 463 list.push_back (hostFloppyDriveObj); 464 } 465 p += _tcslen(p) + 1; 466 } 467 while (*p); 468 delete[] hostDrives; 464 469 #elif defined(RT_OS_LINUX) 465 if (RT_SUCCESS (mHostDrives.updateFloppies())) 466 for (DriveInfoList::const_iterator it = mHostDrives.FloppyBegin(); 467 SUCCEEDED (rc) && it != mHostDrives.FloppyEnd(); ++it) 468 { 469 ComObjPtr<HostFloppyDrive> hostFloppyDriveObj; 470 Bstr device (it->mDevice.c_str()); 471 Bstr udi (it->mUdi.empty() ? NULL : it->mUdi.c_str()); 472 Bstr description (it->mDescription.empty() ? NULL : it->mDescription.c_str()); 473 if (device.isNull() || (!it->mUdi.empty() && udi.isNull()) || 474 (!it->mDescription.empty() && description.isNull())) 475 rc = E_OUTOFMEMORY; 476 if (SUCCEEDED (rc)) 477 rc = hostFloppyDriveObj.createObject(); 478 if (SUCCEEDED (rc)) 479 rc = hostFloppyDriveObj->init (device, udi, description); 480 if (SUCCEEDED (rc)) 481 list.push_back(hostFloppyDriveObj); 482 } 470 if (RT_SUCCESS (mHostDrives.updateFloppies())) 471 for (DriveInfoList::const_iterator it = mHostDrives.FloppyBegin(); 472 SUCCEEDED (rc) && it != mHostDrives.FloppyEnd(); ++it) 473 { 474 ComObjPtr<HostFloppyDrive> hostFloppyDriveObj; 475 Bstr device(it->mDevice); 476 Bstr udi(it->mUdi); 477 Bstr description(it->mDescription); 478 if (SUCCEEDED (rc)) 479 rc = hostFloppyDriveObj.createObject(); 480 if (SUCCEEDED (rc)) 481 rc = hostFloppyDriveObj->init (device, udi, description); 482 if (SUCCEEDED (rc)) 483 list.push_back(hostFloppyDriveObj); 484 } 483 485 #else 484 486 /* PORTME */ 485 487 #endif 486 488 487 SafeIfaceArray<IHostFloppyDrive> collection (list); 488 collection.detachTo(ComSafeArrayOutArg (aDrives)); 489 SafeIfaceArray<IHostFloppyDrive> collection (list); 490 collection.detachTo(ComSafeArrayOutArg (aDrives)); 491 } 492 catch(std::bad_alloc &e) 493 { 494 rc = E_OUTOFMEMORY; 495 } 489 496 return rc; 490 497 } -
trunk/src/VBox/Main/include/HostHardwareLinux.h
r21394 r21436 26 26 27 27 #include <iprt/err.h> 28 #include < string>28 #include <iprt/ministring_cpp.h> 29 29 #include <vector> 30 30 … … 48 48 { 49 49 /** The device node of the drive. */ 50 std::string mDevice;50 iprt::MiniString mDevice; 51 51 /** The hal unique device identifier, if available. */ 52 std::string mUdi;52 iprt::MiniString mUdi; 53 53 /** A textual description of the drive. */ 54 std::string mDescription;54 iprt::MiniString mDescription; 55 55 56 56 /** Constructors */ 57 DriveInfo (std::string aDevice, std::string aUdi, std::string aDescription) 58 : mDevice (aDevice), mUdi (aUdi), mDescription (aDescription) {} 59 DriveInfo (std::string aDevice, std::string aUdi, 60 const char *aDescription = NULL) 61 : mDevice (aDevice), mUdi (aUdi), 62 mDescription (aDescription != NULL ? aDescription : std::string ()) {} 63 DriveInfo (std::string aDevice, const char *aUdi = NULL, 64 const char *aDescription = NULL) 65 : mDevice (aDevice), mUdi (aUdi != NULL ? aUdi : std::string ()), 66 mDescription (aDescription != NULL ? aDescription : std::string ()) {} 57 DriveInfo(const iprt::MiniString &aDevice, 58 const iprt::MiniString &aUdi = "", 59 const iprt::MiniString &aDescription = "") 60 : mDevice(aDevice), 61 mUdi(aUdi), 62 mDescription(aDescription) 63 { } 67 64 }; 68 65 69 66 /** List (resp vector) holding drive information */ 70 typedef std::vector 67 typedef std::vector<DriveInfo> DriveInfoList; 71 68 72 69 /** … … 75 72 * @returns iprt status code 76 73 */ 77 int updateFloppies 74 int updateFloppies(); 78 75 79 76 /** … … 82 79 * @returns iprt status code 83 80 */ 84 int updateDVDs 81 int updateDVDs(); 85 82 86 83 /** Get the first element in the list of floppy drives. */ … … 131 128 { 132 129 /** The device node of the device. */ 133 std::string mDevice;130 iprt::MiniString mDevice; 134 131 /** The sysfs path of the device. */ 135 std::string mSysfsPath;132 iprt::MiniString mSysfsPath; 136 133 /** Type for the list of interfaces. */ 137 typedef std::vector <std::string> InterfaceList;134 typedef std::vector<iprt::MiniString> InterfaceList; 138 135 /** The sysfs paths of the device's interfaces. */ 139 136 InterfaceList mInterfaces; 140 137 141 138 /** Constructors */ 142 USBDeviceInfo (std::string aDevice, std::string aSysfsPath) 143 : mDevice (aDevice), mSysfsPath (aSysfsPath) {} 144 USBDeviceInfo () {} 139 USBDeviceInfo(const iprt::MiniString &aDevice, 140 const iprt::MiniString &aSysfsPath) 141 : mDevice(aDevice), 142 mSysfsPath(aSysfsPath) 143 { } 145 144 }; 146 145 147 146 /** List (resp vector) holding drive information */ 148 typedef std::vector 147 typedef std::vector<USBDeviceInfo> DeviceInfoList; 149 148 150 149 /** -
trunk/src/VBox/Main/linux/HostHardwareLinux.cpp
r21432 r21436 54 54 # include <errno.h> 55 55 #endif /* RT_OS_LINUX */ 56 #include <string>57 56 #include <vector> 58 57 … … 94 93 const char *pszKey, 95 94 const char *pszValue, 96 std::vector< std::string> *pMatches);95 std::vector<iprt::MiniString> *pMatches); 97 96 */ 98 97 static int halGetPropertyStrings (DBusConnection *pConnection, … … 104 103 const char *pszUdi, size_t cProps, 105 104 const char **papszKeys, 106 std::vector< std::string> *pMatches,105 std::vector<iprt::MiniString> *pMatches, 107 106 bool *pfMatches, bool *pfSuccess); 108 107 */ … … 111 110 static int getUSBDeviceInfoFromHal(USBDeviceInfoList *pList, bool *pfSuccess); 112 111 static int getOldUSBDeviceInfoFromHal(USBDeviceInfoList *pList, bool *pfSuccess); 113 static int getUSBInterfacesFromHal(std::vector < std::string> *pList,112 static int getUSBInterfacesFromHal(std::vector <iprt::MiniString> *pList, 114 113 const char *pcszUdi, bool *pfSuccess); 115 114 static DBusHandlerResult dbusFilterFunction (DBusConnection *pConnection, … … 814 813 /** 815 814 * Find the UDIs of hal entries that contain Key=Value property and return the 816 * result on the end of a vector of std::string.815 * result on the end of a vector of iprt::MiniString. 817 816 * @returns iprt status code. If a non-fatal error occurs, we return success 818 817 * but set *pfSuccess to false. … … 820 819 * @param pszKey the property key 821 820 * @param pszValue the property value 822 * @param pMatches pointer to an array of std::string to append the821 * @param pMatches pointer to an array of iprt::MiniString to append the 823 822 * results to. NOT optional. 824 823 * @param pfSuccess will be set to true if the operation succeeds … … 827 826 int halFindDeviceStringMatchVector (DBusConnection *pConnection, 828 827 const char *pszKey, const char *pszValue, 829 std::vector< std::string> *pMatches,828 std::vector<iprt::MiniString> *pMatches, 830 829 bool *pfSuccess) 831 830 { … … 985 984 * @param cProps the number of property values to look up 986 985 * @param papszKeys the keys of the properties to be looked up 987 * @param pMatches pointer to an empty array of std::string to append the986 * @param pMatches pointer to an empty array of iprt::MiniString to append the 988 987 * results to. NOT optional. 989 988 * @param pfMatches pointer to an array of boolean values indicating … … 997 996 const char *pszUdi, size_t cProps, 998 997 const char **papszKeys, 999 std::vector< std::string> *pMatches,998 std::vector<iprt::MiniString> *pMatches, 1000 999 bool *pfMatches, bool *pfSuccess) 1001 1000 { … … 1070 1069 DBusMessageIter iterFind, iterUdis; 1071 1070 1072 rc = halInit (&dbusConnection); 1073 if (!dbusConnection) 1074 halSuccess = false; 1075 if (halSuccess && RT_SUCCESS (rc)) 1076 { 1077 rc = halFindDeviceStringMatch (dbusConnection.get(), "storage.drive_type", 1078 isDVD ? "cdrom" : "floppy", &replyFind); 1079 if (!replyFind) 1071 try 1072 { 1073 rc = halInit (&dbusConnection); 1074 if (!dbusConnection) 1080 1075 halSuccess = false; 1081 }1082 if (halSuccess && RT_SUCCESS (rc))1083 {1084 dbus_message_iter_init (replyFind.get(), &iterFind);1085 if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)1086 halSuccess = false;1087 }1088 if (halSuccess && RT_SUCCESS (rc))1089 dbus_message_iter_recurse (&iterFind, &iterUdis);1090 for (; halSuccess && RT_SUCCESS (rc)1091 && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;1092 dbus_message_iter_next(&iterUdis))1093 {1094 /* Now get all properties from the iterator */1095 const char *pszUdi;1096 dbus_message_iter_get_basic (&iterUdis, &pszUdi);1097 static const char *papszKeys[] =1098 { "block.device", "info.product", "info.vendor" };1099 char *papszValues[RT_ELEMENTS (papszKeys)];1100 rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),1101 papszKeys, papszValues, &replyGet);1102 std::string description;1103 const char *pszDevice = papszValues[0], *pszProduct = papszValues[1],1104 *pszVendor = papszValues[2];1105 if (!!replyGet && pszDevice == NULL)1106 halSuccess = false;1107 if (!!replyGet && pszDevice != NULL)1108 {1109 if ((pszVendor != NULL) && (pszVendor[0] != '\0'))1110 (description += pszVendor) += " ";1111 if ( (pszProduct != NULL && pszProduct[0] != '\0'))1112 description += pszProduct;1113 try1076 if (halSuccess && RT_SUCCESS (rc)) 1077 { 1078 rc = halFindDeviceStringMatch (dbusConnection.get(), "storage.drive_type", 1079 isDVD ? "cdrom" : "floppy", &replyFind); 1080 if (!replyFind) 1081 halSuccess = false; 1082 } 1083 if (halSuccess && RT_SUCCESS (rc)) 1084 { 1085 dbus_message_iter_init (replyFind.get(), &iterFind); 1086 if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY) 1087 halSuccess = false; 1088 } 1089 if (halSuccess && RT_SUCCESS (rc)) 1090 dbus_message_iter_recurse (&iterFind, &iterUdis); 1091 for (; halSuccess && RT_SUCCESS (rc) 1092 && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING; 1093 dbus_message_iter_next(&iterUdis)) 1094 { 1095 /* Now get all properties from the iterator */ 1096 const char *pszUdi; 1097 dbus_message_iter_get_basic (&iterUdis, &pszUdi); 1098 static const char *papszKeys[] = 1099 { "block.device", "info.product", "info.vendor" }; 1100 char *papszValues[RT_ELEMENTS (papszKeys)]; 1101 rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys), 1102 papszKeys, papszValues, &replyGet); 1103 iprt::MiniString description; 1104 const char *pszDevice = papszValues[0], *pszProduct = papszValues[1], 1105 *pszVendor = papszValues[2]; 1106 if (!!replyGet && pszDevice == NULL) 1107 halSuccess = false; 1108 if (!!replyGet && pszDevice != NULL) 1114 1109 { 1110 if ((pszVendor != NULL) && (pszVendor[0] != '\0')) 1111 { 1112 description.append(pszVendor); 1113 description.append(" "); 1114 } 1115 if ((pszProduct != NULL && pszProduct[0] != '\0')) 1116 description.append(pszProduct); 1115 1117 pList->push_back (DriveInfo (pszDevice, pszUdi, description)); 1116 1118 } 1117 catch(std::bad_alloc &e) 1118 { 1119 rc = VERR_NO_MEMORY; 1120 } 1121 } 1122 } 1123 if (dbusError.HasName (DBUS_ERROR_NO_MEMORY)) 1119 } 1120 if (dbusError.HasName (DBUS_ERROR_NO_MEMORY)) 1121 rc = VERR_NO_MEMORY; 1122 if (pfSuccess != NULL) 1123 *pfSuccess = halSuccess; 1124 } 1125 catch(std::bad_alloc &e) 1126 { 1124 1127 rc = VERR_NO_MEMORY; 1125 if (pfSuccess != NULL) 1126 *pfSuccess = halSuccess; 1128 } 1127 1129 LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess)); 1128 1130 dbusError.FlowLog(); … … 1315 1317 */ 1316 1318 /* static */ 1317 int getUSBInterfacesFromHal(std::vector <std::string> *pList,1319 int getUSBInterfacesFromHal(std::vector<iprt::MiniString> *pList, 1318 1320 const char *pcszUdi, bool *pfSuccess) 1319 1321 { -
trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp
r16178 r21436 59 59 { 60 60 RTPrintf (" device: %s", it->mDevice.c_str()); 61 if (!it->mUdi. empty())61 if (!it->mUdi.isEmpty()) 62 62 RTPrintf (", udi: %s", it->mUdi.c_str()); 63 if (!it->mDescription. empty())63 if (!it->mDescription.isEmpty()) 64 64 RTPrintf (", description: %s", it->mDescription.c_str()); 65 65 RTPrintf ("\n"); … … 70 70 { 71 71 RTPrintf (" device: %s", it->mDevice.c_str()); 72 if (!it->mUdi. empty())72 if (!it->mUdi.isEmpty()) 73 73 RTPrintf (", udi: %s", it->mUdi.c_str()); 74 if (!it->mDescription. empty())74 if (!it->mDescription.isEmpty()) 75 75 RTPrintf (", description: %s", it->mDescription.c_str()); 76 76 RTPrintf ("\n"); … … 118 118 return 1; 119 119 } 120 if (RTLinuxSysFsExists("%s/driver", it2->c_str()) != (size != -1)) 120 if (RTLinuxSysFsExists("%s/driver", it2->c_str()) != (size != -1)) 121 121 { 122 122 RTPrintf ("RTLinuxSysFsExists did not return the expected value for the driver link of interface %s of device %s.\n", … … 144 144 RTPrintf("Failed!\n"); 145 145 exit(1); 146 } 146 } 147 147 #endif /* VBOX_USB_WITH_SYSFS */ 148 148 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.
