diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2016-02-11 18:04:45 +0200 |
|---|---|---|
| committer | Pavel Grunt <pgrunt@redhat.com> | 2016-02-18 08:38:49 +0100 |
| commit | 7c85f88f265664c424c368b12d3a0f117beadf54 (patch) | |
| tree | 91c9b06124838511303f1db66389124f24071459 | |
| parent | f81ffa25ae406afe566ceeaa9e5d9fa191ea34b3 (diff) | |
| download | spice-gtk-7c85f88f265664c424c368b12d3a0f117beadf54.tar.gz spice-gtk-7c85f88f265664c424c368b12d3a0f117beadf54.tar.xz spice-gtk-7c85f88f265664c424c368b12d3a0f117beadf54.zip | |
Simplify spice_usb_device_equal_libdev()
The Windows-specific version duplicates some code from
spice_usb_device_manager_libdev_match(), this commit
switches to using that helper instead.
| -rw-r--r-- | src/usb-device-manager.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/usb-device-manager.c b/src/usb-device-manager.c index 6e12602..fab919f 100644 --- a/src/usb-device-manager.c +++ b/src/usb-device-manager.c @@ -1907,19 +1907,14 @@ static gboolean spice_usb_device_equal_libdev(SpiceUsbDevice *device, libusb_device *libdev) { - int vid1, vid2, pid1, pid2; + int vid, pid; if ((device == NULL) || (libdev == NULL)) return FALSE; - vid1 = spice_usb_device_get_vid(device); - pid1 = spice_usb_device_get_pid(device); - - if (!spice_usb_device_manager_get_libdev_vid_pid(libdev, &vid2, &pid2)) { - return FALSE; - } - - return ((vid1 == vid2) && (pid1 == pid2)); + vid = spice_usb_device_get_vid(device); + pid = spice_usb_device_get_pid(device); + return spice_usb_device_manager_libdev_match(libdev, vid, pid); } #endif |