diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2014-03-26 19:21:20 +0000 |
|---|---|---|
| committer | <> | 2014-05-08 15:03:54 +0000 |
| commit | fb123f93f9f5ce42c8e5785d2f8e0edaf951740e (patch) | |
| tree | c2103d76aec5f1f10892cd1d3a38e24f665ae5db /src/VBox/Devices/USB/linux | |
| parent | 58ed4748338f9466599adfc8a9171280ed99e23f (diff) | |
| download | VirtualBox-master.tar.gz | |
Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master
Diffstat (limited to 'src/VBox/Devices/USB/linux')
| -rw-r--r-- | src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp index 9aa2f7e5..a6d0852d 100644 --- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +++ b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -476,7 +476,7 @@ static int usbProxyLinuxFindActiveConfigUsbfs(PUSBPROXYDEV pProxyDev, const char continue; /* Skip ahead to 'Bus' and compare */ - psz = RTStrStripL(psz + 2); Assert(!strncmp(psz, "Bus=", 4)); + psz = RTStrStripL(psz + 2); Assert(!strncmp(psz, RT_STR_TUPLE("Bus="))); psz = RTStrStripL(psz + 4); char *pszNext; uint32_t u; @@ -624,7 +624,7 @@ static int usbProxyLinuxOpen(PUSBPROXYDEV pProxyDev, const char *pszAddress, voi * Are we using sysfs or usbfs? */ #ifdef VBOX_USB_WITH_SYSFS - fUsingSysfs = strncmp(pszAddress, "sysfs:", sizeof("sysfs:") - 1) == 0; + fUsingSysfs = strncmp(pszAddress, RT_STR_TUPLE("sysfs:")) == 0; if (fUsingSysfs) { pszDevNode = strstr(pszAddress, "//device:"); @@ -948,7 +948,7 @@ static int usb_reset_logical_reconnect(PUSBPROXYDEV pDev) /* If it is a serial number string, skip past * "SerialNumber=" */ - if ( strncmp(psz, "SerialNumber=", sizeof("SerialNumber=") - 1) ) + if (strncmp(psz, RT_STR_TUPLE("SerialNumber="))) break; Log2(("usb_reset_logical_reconnect: %s\n", buf)); |