Changeset 63533 in vbox

Timestamp:

Aug 16, 2016 10:08:50 AM (8 years ago)

Author:

vboxsync

Message:

VBoxNetAdpCtl: doIOCtl isn't used on solaris.

File:

• trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp (modified) (4 diffs)

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -205 +205 @@
 }
 
-static int doIOCtl(unsigned long uCmd, VBOXNETADPREQ *pReq)
+
+#ifndef RT_OS_SOLARIS
+static int doIOCtl(unsigned long iCmd, VBOXNETADPREQ *pReq)
 {
     int fd = open(VBOXNETADP_CTL_DEV_NAME, O_RDWR);
@@ -211 +213 @@
     {
         fprintf(stderr, "VBoxNetAdpCtl: Error while %s %s: ",
-                uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
+                iCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
                 pReq->szName[0] ? pReq->szName : "new interface");
         perror("failed to open " VBOXNETADP_CTL_DEV_NAME);
@@ -217 +219 @@
     }
 
-    int rc = ioctl(fd, uCmd, pReq);
+    int rc = ioctl(fd, iCmd, pReq);
     if (rc == -1)
     {
         fprintf(stderr, "VBoxNetAdpCtl: Error while %s %s: ",
-                uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
+                iCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding",
                 pReq->szName[0] ? pReq->szName : "new interface");
         perror("VBoxNetAdpCtl: ioctl failed for " VBOXNETADP_CTL_DEV_NAME);
@@ -231 +233 @@
     return rc;
 }
+#endif /* !RT_OS_SOLARIS */
+
 
 static int checkAdapterName(const char *pcszNameIn, char *pszNameOut)