Changeset 98288 in vbox for trunk/src/VBox/Main/src-server/freebsd

Timestamp:

Jan 24, 2023 3:32:43 PM (2 years ago)

Author:

vboxsync

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

155493

Message:

Main/src-server: rc -> hrc/vrc (partial). bugref:10223

Location:

trunk/src/VBox/Main/src-server/freebsd

Files:

• HostHardwareFreeBSD.cpp (modified) (12 diffs)
• NetIf-freebsd.cpp (modified) (8 diffs)
• PerformanceFreeBSD.cpp (modified) (2 diffs)
• USBProxyBackendFreeBSD.cpp (modified) (5 diffs)

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

@@ -126 +126 @@
 {
     LogFlowThisFunc(("entered\n"));
-    int rc;
+    int vrc;
     try
     {
@@ -133 +133 @@
          * environment variable. */
         bool fSuccess = false;  /* Have we succeeded in finding anything yet? */
-        rc = getDriveInfoFromEnv("VBOX_CDROM", &mDVDList, true /* isDVD */, &fSuccess);
-        if (RT_SUCCESS(rc) && !fSuccess)
-            rc = getDriveInfoFromCAM(&mDVDList, DVD, &fSuccess);
+        vrc = getDriveInfoFromEnv("VBOX_CDROM", &mDVDList, true /* isDVD */, &fSuccess);
+        if (RT_SUCCESS(vrc) && !fSuccess)
+            vrc = getDriveInfoFromCAM(&mDVDList, DVD, &fSuccess);
     }
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-    LogFlowThisFunc(("rc=%Rrc\n", rc));
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+    LogFlowThisFunc(("vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -148 +148 @@
 {
     LogFlowThisFunc(("entered\n"));
-    int rc;
+    int vrc;
     try
     {
@@ -154 +154 @@
         mFloppyList.clear();
         bool fSuccess = false;  /* ignored */
-        rc = getDriveInfoFromEnv("VBOX_FLOPPY", &mFloppyList, false /* isDVD */, &fSuccess);
+        vrc = getDriveInfoFromEnv("VBOX_FLOPPY", &mFloppyList, false /* isDVD */, &fSuccess);
     }
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-    LogFlowThisFunc(("rc=%Rrc\n", rc));
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+    LogFlowThisFunc(("vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -167 +167 @@
 {
     LogFlowThisFunc(("entered\n"));
-    int rc;
+    int vrc;
     try
     {
         mFixedDriveList.clear();
         bool fSuccess = false;  /* ignored */
-        rc = getDriveInfoFromCAM(&mFixedDriveList, Fixed, &fSuccess);
+        vrc = getDriveInfoFromCAM(&mFixedDriveList, Fixed, &fSuccess);
     }
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-    LogFlowThisFunc(("rc=%Rrc\n", rc));
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+    LogFlowThisFunc(("vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -324 +324 @@
 {
     RTFILE hFileXpt = NIL_RTFILE;
-    int rc = RTFileOpen(&hFileXpt, "/dev/xpt0", RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-    if (RT_SUCCESS(rc))
+    int vrc = RTFileOpen(&hFileXpt, "/dev/xpt0", RTFILE_O_READWRITE | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    if (RT_SUCCESS(vrc))
     {
         union ccb DeviceCCB;
@@ -377 +377 @@
             do
             {
-                rc = RTFileIoCtl(hFileXpt, CAMIOCOMMAND, &DeviceCCB, sizeof(union ccb), NULL);
-                if (RT_FAILURE(rc))
+                vrc = RTFileIoCtl(hFileXpt, CAMIOCOMMAND, &DeviceCCB, sizeof(union ccb), NULL);
+                if (RT_FAILURE(vrc))
                 {
-                    Log(("Error while querying available CD/DVD devices rc=%Rrc\n", rc));
+                    Log(("Error while querying available CD/DVD devices vrc=%Rrc\n", vrc));
                     break;
                 }
@@ -431 +431 @@
                         do
                         {
-                            rc = RTFileIoCtl(hFileXpt, CAMIOCOMMAND, &PeriphCCB, sizeof(union ccb), NULL);
-                            if (RT_FAILURE(rc))
+                            vrc = RTFileIoCtl(hFileXpt, CAMIOCOMMAND, &PeriphCCB, sizeof(union ccb), NULL);
+                            if (RT_FAILURE(vrc))
                             {
-                                Log(("Error while querying available periph devices rc=%Rrc\n", rc));
+                                Log(("Error while querying available periph devices vrc=%Rrc\n", vrc));
                                 break;
                             }
@@ -479 +479 @@
                             {
                                 pList->clear();
-                                rc = VERR_NO_MEMORY;
+                                vrc = VERR_NO_MEMORY;
                                 break;
                             }
@@ -489 +489 @@
             } while (   DeviceCCB.ccb_h.status == CAM_REQ_CMP
                      && DeviceCCB.cdm.status == CAM_DEV_MATCH_MORE
-                     && RT_SUCCESS(rc));
+                     && RT_SUCCESS(vrc));
 
             RTMemFree(paMatches);
         }
         else
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
 
         RTFileClose(hFileXpt);
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -524 +524 @@
     AssertPtrNullReturn(pfSuccess, VERR_INVALID_POINTER);
     LogFlowFunc(("pcszVar=%s, pList=%p, isDVD=%d, pfSuccess=%p\n", pcszVar, pList, isDVD, pfSuccess));
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     bool success = false;
     char *pszFreeMe = RTEnvDupEx(RTENV_DEFAULT, pcszVar);
@@ -552 +552 @@
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
+        vrc = VERR_NO_MEMORY;
     }
     RTStrFree(pszFreeMe);
-    LogFlowFunc(("rc=%Rrc, success=%d\n", rc, success));
-    return rc;
-}
-
+    LogFlowFunc(("vrc=%Rrc, success=%d\n", vrc, success));
+    return vrc;
+}
+

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

@@ -124 +124 @@
             Log(("getDefaultIfaceIndex: Got message %u while expecting %u.\n",
                  pRtMsg->rtm_type, RTM_GET));
-            //rc = VERR_INTERNAL_ERROR;
+            //vrc = VERR_INTERNAL_ERROR;
             continue;
         }
@@ -212 +212 @@
 int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     size_t cbNeeded;
     char *pBuf, *pNext;
@@ -220 +220 @@
 
     /* Get the index of the interface associated with default route. */
-    rc = getDefaultIfaceIndex(&u16DefaultIface, PF_INET);
-    if (RT_FAILURE(rc))
+    vrc = getDefaultIfaceIndex(&u16DefaultIface, PF_INET);
+    if (RT_FAILURE(vrc))
     {
         fDefaultIfaceExistent = false;
-        rc = VINF_SUCCESS;
+        vrc = VINF_SUCCESS;
     }
 
@@ -265 +265 @@
             Log(("NetIfList: Got message %u while expecting %u.\n",
                  pIfMsg->ifm_type, RTM_IFINFO));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
             break;
         }
@@ -274 +274 @@
         if (!pNew)
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
             break;
         }
@@ -342 +342 @@
     close(sock);
     free(pBuf);
-    return rc;
-
-
+    return vrc;
 }
 
 int NetIfGetConfigByName(PNETIFINFO pInfo)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     size_t cbNeeded;
     char *pBuf, *pNext;
@@ -392 +390 @@
             Log(("NetIfList: Got message %u while expecting %u.\n",
                  pIfMsg->ifm_type, RTM_IFINFO));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
             break;
         }
@@ -443 +441 @@
     close(sock);
     free(pBuf);
-    return rc;
+    return vrc;
 }
 

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

@@ -69 +69 @@
 int CollectorFreeBSD::getHostMemoryUsage(ULONG *total, ULONG *used, ULONG *available)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     u_long cbMemPhys = 0;
     u_int cPagesMemFree = 0;
@@ -105 +105 @@
     }
     else
-        rc = VERR_NOT_SUPPORTED;
+        vrc = VERR_NOT_SUPPORTED;
 
-    return rc;
+    return vrc;
 }
 

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

@@ -88 +88 @@
      * Create semaphore.
      */
-    int rc = RTSemEventCreate(&mNotifyEventSem);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = RTSemEventCreate(&mNotifyEventSem);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /*
@@ -222 +222 @@
     int iBus  = 0;
     int iAddr = 1;
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     char *pszDevicePath = NULL;
     uint32_t PlugTime = 0;
@@ -228 +228 @@
     for (;;)
     {
-        rc = RTStrAPrintf(&pszDevicePath, "/dev/%s%d.%d", USB_GENERIC_NAME, iBus, iAddr);
-        if (RT_FAILURE(rc))
+        vrc = RTStrAPrintf(&pszDevicePath, "/dev/%s%d.%d", USB_GENERIC_NAME, iBus, iAddr);
+        if (RT_FAILURE(vrc))
             break;
 
@@ -260 +260 @@
         RT_ZERO(UsbDevInfo);
 
-        rc = ioctl(FileUsb, USB_GET_DEVICEINFO, &UsbDevInfo);
-        if (rc < 0)
+        vrc = ioctl(FileUsb, USB_GET_DEVICEINFO, &UsbDevInfo);
+        if (vrc < 0)
         {
-            LogFlowFunc((": Error querying device info rc=%Rrc\n", RTErrConvertFromErrno(errno)));
+            LogFlowFunc((": Error querying device info vrc=%Rrc\n", RTErrConvertFromErrno(errno)));
             close(FileUsb);
             RTStrFree(pszDevicePath);
@@ -331 +331 @@
                 pDevice->u64SerialHash = USBLibHashSerial(UsbDevInfo.udi_serial);
             }
-            rc = ioctl(FileUsb, USB_GET_PLUGTIME, &PlugTime);
-            if (rc == 0)
+            vrc = ioctl(FileUsb, USB_GET_PLUGTIME, &PlugTime);
+            if (vrc == 0)
                 pDevice->u64SerialHash  += PlugTime;