Changeset 35819 in vbox for trunk/src/apps

Timestamp:

Feb 1, 2011 8:21:53 PM (14 years ago)

Author:

vboxsync

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

69807

Message:

VBoxNetAdpCtl: be more verbose on error

File:

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

trunk/src/apps/adpctl/VBoxNetAdpCtl.cpp

@@ -179 +179 @@
 }
 
-int doIOCtl(unsigned long uCmd, void *pData)
+static int doIOCtl(unsigned long uCmd, VBOXNETADPREQ *pReq)
 {
     int fd = open(VBOXNETADP_CTL_DEV_NAME, O_RDWR);
     if (fd == -1)
     {
-        perror("VBoxNetAdpCtl: failed to open " VBOXNETADP_CTL_DEV_NAME);
+        fprintf(stderr, "VBoxNetAdpCtl: Error while %s '%s': ",
+               uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding", pReq->szName);
+        perror("failed to open " VBOXNETADP_CTL_DEV_NAME);
         return ADPCTLERR_NO_CTL_DEV;
     }
 
-    int rc = ioctl(fd, uCmd, pData);
+    int rc = ioctl(fd, uCmd, pReq);
     if (rc == -1)
     {
+        fprintf(stderr, "VBoxNetAdpCtl: Error while %s '%s': ",
+               uCmd == VBOXNETADP_CTL_REMOVE ? "removing" : "adding", pReq->szName);
         perror("VBoxNetAdpCtl: ioctl failed for " VBOXNETADP_CTL_DEV_NAME);
         rc = ADPCTLERR_IOCTL_FAILED;
@@ -200 +204 @@
 }
 
-int checkAdapterName(const char *pcszNameIn, char *pszNameOut)
+static int checkAdapterName(const char *pcszNameIn, char *pszNameOut)
 {
     int iAdapterIndex = -1;
@@ -208 +212 @@
         || iAdapterIndex < 0 || iAdapterIndex > 99 )
     {
-        fprintf(stderr, "Setting configuration for %s is not supported.\n", pcszNameIn);
+        fprintf(stderr, "VBoxNetAdpCtl: Setting configuration for '%s' is not supported.\n", pcszNameIn);
         return ADPCTLERR_BAD_NAME;
     }
@@ -214 +218 @@
     if (strcmp(pszNameOut, pcszNameIn))
     {
-        fprintf(stderr, "Invalid adapter name %s.\n", pcszNameIn);
+        fprintf(stderr, "VBoxNetAdpCtl: Invalid adapter name '%s'.\n", pcszNameIn);
         return ADPCTLERR_BAD_NAME;
     }
@@ -222 +226 @@
 
 int main(int argc, char *argv[])
-
 {
     char szAdapterName[VBOXNETADP_MAX_NAME_LEN];