From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Wed, 26 Mar 2014 19:21:20 +0000 Subject: Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2. --- src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp') diff --git a/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp b/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp index 8261d990..0d6d85e8 100644 --- a/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp @@ -173,7 +173,7 @@ static int solarisWalkDeviceNode(di_node_t Node, void *pvArg) char *pszCompatNames = NULL; int cCompatNames = di_compatible_names(Node, &pszCompatNames); for (int i = 0; i < cCompatNames; i++, pszCompatNames += strlen(pszCompatNames) + 1) - if (!strncmp(pszCompatNames, "usb", 3)) + if (!strncmp(pszCompatNames, RT_STR_TUPLE("usb"))) { fUSBDevice = true; break; @@ -304,7 +304,7 @@ static int solarisWalkDeviceNode(di_node_t Node, void *pvArg) pList->pTail = pList->pHead = pCur; rc = DI_WALK_CONTINUE; - } while(0); + } while (0); di_devfs_path_free(pszDevicePath); if (!fValidDevice) @@ -322,7 +322,7 @@ static USBDEVICESTATE solarisDetermineUSBDeviceState(PUSBDEVICE pDevice, di_node if (!pszDriverName) return USBDEVICESTATE_UNUSED; - if (!strncmp(pszDriverName, VBOXUSB_DRIVER_NAME, sizeof(VBOXUSB_DRIVER_NAME) - 1)) + if (!strncmp(pszDriverName, RT_STR_TUPLE(VBOXUSB_DRIVER_NAME))) return USBDEVICESTATE_HELD_BY_PROXY; NOREF(pDevice); -- cgit v1.2.1