Changeset 98292 in vbox for trunk/src/VBox/Main/src-server/solaris

Timestamp:

Jan 25, 2023 1:14:53 AM (23 months ago)

Author:

vboxsync

Message:

Main/src-server: rc -> hrc/vrc. Enabled scm rc checks. bugref:10223

Location:

trunk/src/VBox/Main/src-server/solaris

Files:

• DynLoadLibSolaris.cpp (modified) (2 diffs)
• NetIf-solaris.cpp (modified) (4 diffs)
• PerformanceSolaris.cpp (modified) (16 diffs)
• USBProxyBackendSolaris.cpp (modified) (8 diffs)

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

@@ -62 +62 @@
         return g_hLibDlpi != NIL_RTLDRMOD;
     g_fCheckedForLibDlpi = true;
-    int rc = RTLdrLoad(LIB_DLPI, &hLibDlpi);
-    if (RT_SUCCESS(rc))
+    int vrc = RTLdrLoad(LIB_DLPI, &hLibDlpi);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -69 +69 @@
          * open the VNIC/link which requires root permissions :/
          */
-        rc  = RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk);
-        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose);
-        rc |= RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen);
-        if (RT_SUCCESS(rc))
+        vrc  = RTLdrGetSymbol(hLibDlpi, "dlpi_walk", (void **)&g_pfnLibDlpiWalk);
+        vrc |= RTLdrGetSymbol(hLibDlpi, "dlpi_close", (void **)&g_pfnLibDlpiClose);
+        vrc |= RTLdrGetSymbol(hLibDlpi, "dlpi_open", (void **)&g_pfnLibDlpiOpen);
+        if (RT_SUCCESS(vrc))
         {
             g_hLibDlpi = hLibDlpi;

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

@@ -461 +461 @@
         RT_ZERO(IfNum);
         IfNum.lifn_family = AF_INET;
-        int rc = ioctl(Sock, SIOCGLIFNUM, &IfNum);
-        if (!rc)
+        int iRc = ioctl(Sock, SIOCGLIFNUM, &IfNum);
+        if (!iRc)
         {
             int cIfaces = RT_MIN(1024, IfNum.lifn_count); /* sane limit */
@@ -474 +474 @@
                 IfConfig.lifc_len = (int)cbIfaces;
                 IfConfig.lifc_buf = (caddr_t)paIfaces;
-                rc = ioctl(Sock, SIOCGLIFCONF, &IfConfig);
-                if (!rc)
+                iRc = ioctl(Sock, SIOCGLIFCONF, &IfConfig);
+                if (!iRc)
                 {
                     for (int i = 0; i < cIfaces; i++)
@@ -486 +486 @@
 
 #if 0
-                        rc = ioctl(Sock, SIOCGLIFADDR, &(paIfaces[i]));
-                        if (rc >= 0)
+                        iRc = ioctl(Sock, SIOCGLIFADDR, &(paIfaces[i]));
+                        if (iRc >= 0)
                         {
                             memcpy(Info.IPAddress.au8, ((struct sockaddr *)&paIfaces[i].lifr_addr)->sa_data,
@@ -501 +501 @@
                              * address this way, so we just use all zeros there.
                              */
-                            rc = ioctl(Sock, SIOCGARP, &ArpReq);
-                            if (rc >= 0)
+                            iRc = ioctl(Sock, SIOCGARP, &ArpReq);
+                            if (iRc >= 0)
                                 memcpy(&Info.MACAddress, ArpReq.arp_ha.sa_data, sizeof(Info.MACAddress));
 

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

@@ -181 +181 @@
 
     uint64_t cb;
-    int rc = RTSystemQueryTotalRam(&cb);
-    if (RT_FAILURE(rc))
+    int vrc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(vrc))
         totalRAM = 0;
     else
@@ -201 +201 @@
 int CollectorSolaris::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle)
 {
-    int rc = VINF_SUCCESS;
     kstat_t *ksp;
     uint64_t tmpUser, tmpKernel, tmpIdle;
@@ -237 +236 @@
     if (idle)   *idle   = tmpIdle;
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
 int CollectorSolaris::getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uint64_t *kernel, uint64_t *total)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     char *pszName;
     prusage_t prusage;
@@ -275 +274 @@
         {
             Log(("read() -> %d\n", errno));
-            rc = VERR_FILE_IO_ERROR;
+            vrc = VERR_FILE_IO_ERROR;
         }
         close(h);
@@ -282 +281 @@
     {
         Log(("open() -> %d\n", errno));
-        rc = VERR_ACCESS_DENIED;
-    }
-
-    return rc;
+        vrc = VERR_ACCESS_DENIED;
+    }
+
+    return vrc;
 }
 
@@ -292 +291 @@
     AssertReturn(totalRAM, VERR_INTERNAL_ERROR);
     uint64_t cb;
-    int rc = RTSystemQueryAvailableRam(&cb);
-    if (RT_SUCCESS(rc))
+    int vrc = RTSystemQueryAvailableRam(&cb);
+    if (RT_SUCCESS(vrc))
     {
         *total = totalRAM;
@@ -299 +298 @@
         *used = *total - *available;
     }
-    return rc;
+    return vrc;
 }
 
 int CollectorSolaris::getProcessMemoryUsage(RTPROCESS process, ULONG *used)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     char *pszName = NULL;
     psinfo_t psinfo;
@@ -327 +326 @@
         {
             Log(("read() -> %d\n", errno));
-            rc = VERR_FILE_IO_ERROR;
+            vrc = VERR_FILE_IO_ERROR;
         }
         close(h);
@@ -334 +333 @@
     {
         Log(("open() -> %d\n", errno));
-        rc = VERR_ACCESS_DENIED;
-    }
-
-    return rc;
+        vrc = VERR_ACCESS_DENIED;
+    }
+
+    return vrc;
 }
 
@@ -471 +470 @@
 int CollectorSolaris::getRawHostDiskLoad(const char *name, uint64_t *disk_ms, uint64_t *total_ms)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     AssertReturn(strlen(name) < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
     LogFlowThisFunc(("n=%s\n", name));
@@ -480 +479 @@
         {
             LogRel(("kstat_read(%s) -> %d\n", name, errno));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
         }
         else
@@ -496 +495 @@
     {
         LogRel(("kstat_lookup(%s) -> %d\n", name, errno));
-        rc = VERR_INTERNAL_ERROR;
-    }
-
-    return rc;
+        vrc = VERR_INTERNAL_ERROR;
+    }
+
+    return vrc;
 }
 
@@ -568 +567 @@
 int CollectorSolaris::getHostDiskSize(const char *name, uint64_t *size)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     AssertReturn(strlen(name) + 5 < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
     LogFlowThisFunc(("n=%s\n", name));
@@ -580 +579 @@
         {
             LogRel(("kstat_read(%s) -> %d\n", name, errno));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
         }
         else
@@ -596 +595 @@
     {
         LogRel(("kstat_lookup(%s) -> %d\n", szName, errno));
-        rc = VERR_INTERNAL_ERROR;
-    }
-
-
-    return rc;
+        vrc = VERR_INTERNAL_ERROR;
+    }
+
+
+    return vrc;
 }
 
@@ -731 +730 @@
     {
         struct mnttab Entry;
-        int rc = 0;
+        int iRc = 0;
         resetmnttab(fp);
-        while ((rc = getmntent(fp, &Entry)) == 0)
+        while ((iRc = getmntent(fp, &Entry)) == 0)
             mFsMap[Entry.mnt_mountp] = Entry.mnt_special;
         fclose(fp);
-        if (rc != -1)
-            LogRel(("Error while reading mnttab: %d\n", rc));
-    }
-}
-
-}
+        if (iRc != -1)
+            LogRel(("Error while reading mnttab: %d\n", iRc));
+    }
+}
+
+}

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

@@ -91 +91 @@
      * Create semaphore.
      */
-    int rc = RTSemEventCreate(&mNotifyEventSem);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = RTSemEventCreate(&mNotifyEventSem);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /*
      * Initialize the USB library.
      */
-    rc = USBLibInit();
-    if (RT_FAILURE(rc))
+    vrc = USBLibInit();
+    if (RT_FAILURE(vrc))
     {
         /* mNotifyEventSem will be destroyed in uninit */
-        return rc;
+        return vrc;
     }
 
@@ -209 +209 @@
     int *pInt = NULL;
     char *pStr = NULL;
-    int rc = DI_WALK_CONTINUE;
+    int iRc = DI_WALK_CONTINUE;
     if (di_prop_lookup_ints(DDI_DEV_T_ANY, Node, "interface", &pInt) < 0)
     {
@@ -337 +337 @@
                 pList->pTail = pList->pHead = pCur;
 
-            rc = DI_WALK_CONTINUE;
+            iRc = DI_WALK_CONTINUE;
         } while (0);
 
@@ -344 +344 @@
             solarisFreeUSBDevice(pCur);
     }
-    return rc;
+    return iRc;
 }
 
@@ -393 +393 @@
 
     PUSBDEVICE pDev = aDevice->i_getUsbData();
-    int rc = USBLibResetDevice(pDev->pszDevicePath, true);
-    if (RT_SUCCESS(rc))
+    int vrc = USBLibResetDevice(pDev->pszDevicePath, true);
+    if (RT_SUCCESS(vrc))
         aDevice->i_setBackendUserData(pvId);
     else
@@ -401 +401 @@
         pvId = NULL;
     }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
+    LogFlowThisFunc(("returns %Rrc pvId=%p\n", vrc, pvId));
+    return vrc;
 }
 
@@ -449 +449 @@
 
     PUSBDEVICE pDev = aDevice->i_getUsbData();
-    int rc = USBLibResetDevice(pDev->pszDevicePath, true /* Re-attach */);
-    if (RT_SUCCESS(rc))
+    int vrc = USBLibResetDevice(pDev->pszDevicePath, true /* Re-attach */);
+    if (RT_SUCCESS(vrc))
         aDevice->i_setBackendUserData(pvId);
     else
@@ -457 +457 @@
         pvId = NULL;
     }
-    LogFlowThisFunc(("returns %Rrc pvId=%p\n", rc, pvId));
-    return rc;
+    LogFlowThisFunc(("returns %Rrc pvId=%p\n", vrc, pvId));
+    return vrc;
 }