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

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/darwin

Files:

• HostDnsServiceDarwin.cpp (modified) (2 diffs)
• HostPowerDarwin.cpp (modified) (1 diff)
• NetIf-darwin.cpp (modified) (9 diffs)
• PerformanceDarwin.cpp (modified) (6 diffs)
• iokit.cpp (modified) (7 diffs)

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

@@ -90 +90 @@
         return E_OUTOFMEMORY;
 
-    int rc = RTSemEventCreate(&m->m_evtStop);
-    AssertRCReturn(rc, E_FAIL);
+    int vrc = RTSemEventCreate(&m->m_evtStop);
+    AssertRCReturn(vrc, E_FAIL);
 
     CFRunLoopSourceContext sctx;
@@ -158 +158 @@
 
     /* Trigger initial update. */
-    int rc = updateInfo();
-    AssertRC(rc); /* Not fatal in release builds. */  /** @todo r=bird: The function always returns VINF_SUCCESS. */
+    int vrc = updateInfo();
+    AssertRC(vrc); /* Not fatal in release builds. */  /** @todo r=bird: The function always returns VINF_SUCCESS. */
 
     while (!ASMAtomicReadBool(&m->m_fStop))

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

@@ -47 +47 @@
 {
     /* Create the new worker thread. */
-    int rc = RTThreadCreate(&mThread, HostPowerServiceDarwin::powerChangeNotificationThread, this, 65536,
-                            RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "MainPower");
-
-    if (RT_FAILURE(rc))
-        LogFlow(("RTThreadCreate failed with %Rrc\n", rc));
+    int vrc = RTThreadCreate(&mThread, HostPowerServiceDarwin::powerChangeNotificationThread, this, 65536,
+                             RTTHREADTYPE_IO, RTTHREADFLAGS_WAITABLE, "MainPower");
+    AssertLogRelRC(vrc);
 }
 

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

@@ -74 +74 @@
     }
     struct ifaddrs *IfAddrs, *pAddr;
-    int rc = getifaddrs(&IfAddrs);
-    if (rc)
+    int iRc = getifaddrs(&IfAddrs);
+    if (iRc)
     {
         close(sock);
-        Log(("NetIfList: getifaddrs() -> %d\n", rc));
+        Log(("NetIfList: getifaddrs() -> %d\n", iRc));
         return VERR_INTERNAL_ERROR;
     }
@@ -253 +253 @@
             Log(("getDefaultIfaceIndex: Got message %u while expecting %u.\n",
                  pRtMsg->rtm_type, RTM_GET));
-            //rc = VERR_INTERNAL_ERROR;
+            //vrc = VERR_INTERNAL_ERROR;
             continue;
         }
@@ -286 +286 @@
 int NetIfList(std::list <ComObjPtr<HostNetworkInterface> > &list)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     size_t cbNeeded;
     char *pBuf, *pNext;
@@ -293 +293 @@
 
     /* Get the index of the interface associated with default route. */
-    rc = getDefaultIfaceIndex(&u16DefaultIface);
-    if (RT_FAILURE(rc))
-        return rc;
+    vrc = getDefaultIfaceIndex(&u16DefaultIface);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     aiMib[0] = CTL_NET;
@@ -338 +338 @@
             Log(("NetIfList: Got message %u while expecting %u.\n",
                  pIfMsg->ifm_type, RTM_IFINFO));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
             break;
         }
@@ -355 +355 @@
         if (!pNew)
         {
-            rc = VERR_NO_MEMORY;
+            vrc = VERR_NO_MEMORY;
             break;
         }
@@ -439 +439 @@
     close(sock);
     RTMemFree(pBuf);
-    return rc;
+    return vrc;
 }
 
 int NetIfGetConfigByName(PNETIFINFO pInfo)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     size_t cbNeeded;
     char *pBuf, *pNext;
@@ -487 +487 @@
             Log(("NetIfList: Got message %u while expecting %u.\n",
                  pIfMsg->ifm_type, RTM_IFINFO));
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
             break;
         }
@@ -539 +539 @@
     close(sock);
     RTMemFree(pBuf);
-    return rc;
+    return vrc;
 }
 

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

@@ -88 +88 @@
 {
     uint64_t cb;
-    int rc = RTSystemQueryTotalRam(&cb);
-    if (RT_FAILURE(rc))
+    int vrc = RTSystemQueryTotalRam(&cb);
+    if (RT_FAILURE(vrc))
         totalRAM = 0;
     else
@@ -128 +128 @@
     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;
@@ -136 +136 @@
         *used = *total - *available;
     }
-    return rc;
+    return vrc;
 }
 
@@ -161 +161 @@
     struct proc_taskinfo tinfo;
 
-    int rc = getProcessInfo(process, &tinfo);
-    if (RT_SUCCESS(rc))
+    int vrc = getProcessInfo(process, &tinfo);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -172 +172 @@
         *total = mach_absolute_time();
     }
-    return rc;
+    return vrc;
 }
 
@@ -179 +179 @@
     struct proc_taskinfo tinfo;
 
-    int rc = getProcessInfo(process, &tinfo);
-    if (RT_SUCCESS(rc))
+    int vrc = getProcessInfo(process, &tinfo);
+    if (RT_SUCCESS(vrc))
     {
         uint64_t cKbResident = tinfo.pti_resident_size / 1024;
         *used = cKbResident < ~(ULONG)0 ? (ULONG)cKbResident : ~(ULONG)0;
     }
-    return rc;
+    return vrc;
 }
 

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

@@ -836 +836 @@
      */
     io_iterator_t USBDevices = IO_OBJECT_NULL;
-    IOReturn rc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
-    AssertMsgReturn(rc == kIOReturnSuccess, ("rc=%d\n", rc), KERN_FAILURE);
+    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), KERN_FAILURE);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1087 +1087 @@
      */
     io_iterator_t USBDevices = IO_OBJECT_NULL;
-    IOReturn rc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
-    AssertMsgReturn(rc == kIOReturnSuccess, ("rc=%d\n", rc), NULL);
+    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &USBDevices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1188 +1188 @@
                 SInt32 Score = 0;
                 IOCFPlugInInterface **ppPlugInInterface = NULL;
-                rc = IOCreatePlugInInterfaceForService(USBDevice, kIOUSBDeviceUserClientTypeID,
-                                                       kIOCFPlugInInterfaceID, &ppPlugInInterface, &Score);
-                if (rc == kIOReturnSuccess)
+                irc = IOCreatePlugInInterfaceForService(USBDevice, kIOUSBDeviceUserClientTypeID,
+                                                        kIOCFPlugInInterfaceID, &ppPlugInInterface, &Score);
+                if (irc == kIOReturnSuccess)
                 {
                     IOUSBDeviceInterface245 **ppUSBDevI = NULL;
@@ -1196 +1196 @@
                                                                        CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID245),
                                                                        (LPVOID *)&ppUSBDevI);
-                    rc = IODestroyPlugInInterface(ppPlugInInterface); Assert(rc == kIOReturnSuccess);
+                    irc = IODestroyPlugInInterface(ppPlugInInterface); Assert(irc == kIOReturnSuccess);
                     ppPlugInInterface = NULL;
                     if (hrc == S_OK)
@@ -1316 +1316 @@
      */
     io_iterator_t DVDServices = IO_OBJECT_NULL;
-    IOReturn rc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &DVDServices);
-    AssertMsgReturn(rc == kIOReturnSuccess, ("rc=%d\n", rc), NULL);
+    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &DVDServices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1447 +1447 @@
      */
     io_iterator_t MediaServices = IO_OBJECT_NULL;
-    IOReturn rc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &MediaServices);
-    AssertMsgReturn(rc == kIOReturnSuccess, ("rc=%d\n", rc), NULL);
+    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &MediaServices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1612 +1612 @@
      */
     io_iterator_t EtherIfServices = IO_OBJECT_NULL;
-    IOReturn rc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &EtherIfServices);
-    AssertMsgReturn(rc == kIOReturnSuccess, ("rc=%d\n", rc), NULL);
+    IOReturn irc = IOServiceGetMatchingServices(g_MasterPort, RefMatchingDict, &EtherIfServices);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */