Changeset 46326 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 30, 2013 12:16:53 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86097

Message:

RT_STR_TUPLE

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (2 diffs)
• linux/USBGetDevices.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -2278 +2278 @@
                                 char *pszSlice = solarisGetSliceFromPath(pszDevLinkPath);
                                 if (   pszSlice && !strcmp(pszSlice, "s2")
-                                    && !strncmp(pszDevLinkPath, "/dev/rdsk", sizeof("/dev/rdsk") - 1))   /* We want only raw disks */
+                                    && !strncmp(pszDevLinkPath, RT_STR_TUPLE("/dev/rdsk")))   /* We want only raw disks */
                                 {
                                     /*
@@ -2730 +2730 @@
                 // skip devices we are not interested in
                 if ((*mountName && mountName[0] == '/') &&                      // skip 'fake' devices (like -hosts, proc, fd, swap)
-                    (*mountFSType && (strncmp(mountFSType, "devfs", 5) != 0 &&  // skip devfs (i.e. /devices)
-                                      strncmp(mountFSType, "dev", 3) != 0 &&    // skip dev (i.e. /dev)
-                                      strncmp(mountFSType, "lofs", 4) != 0)))   // skip loop-back file-system (lofs)
+                    (*mountFSType && (strncmp(mountFSType, RT_STR_TUPLE("devfs")) != 0 &&  // skip devfs (i.e. /devices)
+                                      strncmp(mountFSType, RT_STR_TUPLE("dev")) != 0 &&    // skip dev (i.e. /dev)
+                                      strncmp(mountFSType, RT_STR_TUPLE("lofs")) != 0)))   // skip loop-back file-system (lofs)
                 {
                     char *rawDevName = getfullrawname((char *)mountName);

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -358 +358 @@
     pszValue = RTStrStripL(pszValue);
     /* verified with Linux 2.4.0 ... Linux 2.6.25 */
-    if (!strncmp(pszValue, "1.5", 3))
+    if (!strncmp(pszValue, RT_STR_TUPLE("1.5")))
         *pSpd = USBDEVICESPEED_LOW;
-    else if (!strncmp(pszValue, "12 ", 3))
+    else if (!strncmp(pszValue, RT_STR_TUPLE("12 ")))
         *pSpd = USBDEVICESPEED_FULL;
-    else if (!strncmp(pszValue, "480", 3))
+    else if (!strncmp(pszValue, RT_STR_TUPLE("480")))
         *pSpd = USBDEVICESPEED_HIGH;
     else
@@ -1123 +1123 @@
     {
         /* No -/. so it must be a root hub. Check that it's usb<something>. */
-        if (strncmp(pszLastComp, "usb", sizeof("usb") - 1) != 0)
+        if (strncmp(pszLastComp, RT_STR_TUPLE("usb")) != 0)
         {
             Log(("usbGetPortFromSysfsPath(%s): failed [2]\n", pszPath));