Changeset 17929 in vbox for trunk/src/VBox/Main/linux
- Timestamp:
- Mar 16, 2009 1:09:36 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 44497
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/linux/HostHardwareLinux.cpp
r16543 r17929 90 90 const char *pszKey, const char *pszValue, 91 91 RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> *pMessage); 92 /* 92 93 static int halFindDeviceStringMatchVector (DBusConnection *pConnection, 93 94 const char *pszKey, 94 95 const char *pszValue, 95 96 std::vector<std::string> *pMatches); 97 */ 96 98 static int halGetPropertyStrings (DBusConnection *pConnection, 97 99 const char *pszUdi, size_t cKeys, 98 100 const char **papszKeys, char **papszValues, 99 101 RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> *pMessage); 102 /* 100 103 static int halGetPropertyStringsVector (DBusConnection *pConnection, 101 104 const char *pszUdi, size_t cProps, … … 103 106 std::vector<std::string> *pMatches, 104 107 bool *pfMatches, bool *pfSuccess); 108 */ 105 109 static int getDriveInfoFromHal(DriveInfoList *pList, bool isDVD, 106 110 bool *pfSuccess); … … 632 636 if (halSuccess) 633 637 { 634 dbus_bus_add_match (dbusConnection.get(), 638 dbus_bus_add_match (dbusConnection.get(), 635 639 "type='signal'," 636 640 "interface='org.freedesktop.Hal.Manager'," … … 680 684 if (halSuccess) 681 685 { 682 dbus_bus_add_match (dbusConnection.get(), 686 dbus_bus_add_match (dbusConnection.get(), 683 687 "type='signal'," 684 688 "interface='org.freedesktop.Hal.Manager'," … … 708 712 autoDBusError dbusError; 709 713 710 dbus_bus_remove_match (pConnection, 714 dbus_bus_remove_match (pConnection, 711 715 "type='signal'," 712 716 "interface='org.freedesktop.Hal.Manager'," … … 730 734 autoDBusError dbusError; 731 735 732 dbus_bus_remove_match (pConnection, 736 dbus_bus_remove_match (pConnection, 733 737 "type='signal'," 734 738 "interface='org.freedesktop.Hal.Manager'," … … 925 929 926 930 RTMemAutoPtr <DBusMessage, VBoxDBusMessageUnref> message, reply; 927 DBusMessageIter iterGet, iterProps , iterKey, iterValue;931 DBusMessageIter iterGet, iterProps; 928 932 929 933 /* Initialise the return array to NULLs */ … … 1202 1206 USBDeviceInfo info (pszDevice, pszSysfsPath); 1203 1207 bool ifaceSuccess = true; /* If we can't get the interfaces, just 1204 * skip this one device. */ 1208 * skip this one device. */ 1205 1209 rc = getUSBInterfacesFromHal (&info.mInterfaces, pszUdi, &ifaceSuccess); 1206 1210 if (RT_SUCCESS(rc) && halSuccess && ifaceSuccess) … … 1287 1291 USBDeviceInfo info (pszDevice, pszSysfsPath); 1288 1292 bool ifaceSuccess = false; /* If we can't get the interfaces, just 1289 * skip this one device. */ 1293 * skip this one device. */ 1290 1294 rc = getUSBInterfacesFromHal (&info.mInterfaces, pszSysfsPath, 1291 1295 &ifaceSuccess); … … 1411 1415 */ 1412 1416 /* static */ 1413 DBusHandlerResult dbusFilterFunction (DBusConnection * pConnection,1417 DBusHandlerResult dbusFilterFunction (DBusConnection * /* pConnection */, 1414 1418 DBusMessage *pMessage, void *pvUser) 1415 1419 {
Note:
See TracChangeset
for help on using the changeset viewer.