Changeset 48016 in vbox for trunk/src/VBox

Timestamp:

Aug 23, 2013 9:22:14 AM (11 years ago)

Author:

vboxsync

Message:

RT_STR_TUPLE

Location:

trunk/src/VBox/Main/src-server

Files:

• darwin/NetIf-darwin.cpp (modified) (1 diff)
• freebsd/NetIf-freebsd.cpp (modified) (1 diff)
• linux/NetIf-linux.cpp (modified) (1 diff)
• solaris/NetIf-solaris.cpp (modified) (4 diffs)
• solaris/USBProxyServiceSolaris.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp

@@ -402 +402 @@
 
             HostNetworkInterfaceType_T enmType;
-            if (strncmp("vboxnet", pNew->szName, 7))
+            if (strncmp(pNew->szName, RT_STR_TUPLE("vboxnet")))
                 enmType = HostNetworkInterfaceType_Bridged;
             else

trunk/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp

@@ -282 +282 @@
 
             HostNetworkInterfaceType_T enmType;
-            if (strncmp("vboxnet", pNew->szName, 7))
+            if (strncmp(pNew->szName, RT_STR_TUPLE("vboxnet")))
                 enmType = HostNetworkInterfaceType_Bridged;
             else

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

@@ -237 +237 @@
 
                     HostNetworkInterfaceType_T enmType;
-                    if (strncmp("vboxnet", pszName, 7))
+                    if (strncmp(pszName, RT_STR_TUPLE("vboxnet")))
                         enmType = HostNetworkInterfaceType_Bridged;
                     else

trunk/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp

@@ -277 +277 @@
 
     HostNetworkInterfaceType_T enmType;
-    if (strncmp("vboxnet", szNICInstance, 7))
+    if (strncmp(szNICInstance, RT_STR_TUPLE("vboxnet")))
         enmType = HostNetworkInterfaceType_Bridged;
     else
@@ -293 +293 @@
      * Skip IPSEC interfaces. It's at IP level.
      */
-    if (!strncmp(pszIface, "ip.tun", 6))
+    if (!strncmp(pszIface, RT_STR_TUPLE("ip.tun")))
         return _B_FALSE;
 
@@ -300 +300 @@
      * These names originate from VBoxNetFltBow-solaris.c, hardcoded here for now.
      */
-    if (    strncmp(pszIface, "vboxvnic_template", 17)
-        && !strncmp(pszIface, "vboxvnic", 8))
+    if (    strncmp(pszIface, RT_STR_TUPLE("vboxvnic_template"))
+        && !strncmp(pszIface, RT_STR_TUPLE("vboxvnic")))
         return _B_FALSE;
 
@@ -437 +437 @@
                          * Skip loopback interfaces.
                          */
-                        if (!strncmp(Ifaces[i].lifr_name, "lo", 2))
+                        if (!strncmp(Ifaces[i].lifr_name, RT_STR_TUPLE("lo")))
                             continue;
 

trunk/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp

@@ -174 +174 @@
     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;
@@ -323 +323 @@
         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;