Changeset 94965 in vbox

Timestamp:

May 9, 2022 3:03:17 PM (3 years ago)

Author:

vboxsync

Message:

Main/src-client/RemoteUSBBackend.cpp: Adjust to the new rules wrt. to rc -> hrc,vrc usage, ​bugref:10223

File:

• trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp (modified) (37 diffs)

trunk/src/VBox/Main/src-client/RemoteUSBBackend.cpp

@@ -125 +125 @@
 static void requestDevice(REMOTEUSBDEVICE *pDevice)
 {
-    int rc = RTCritSectEnter(&pDevice->critsect);
-    AssertRC(rc);
+    int vrc = RTCritSectEnter(&pDevice->critsect);
+    AssertRC(vrc);
 }
 
@@ -158 +158 @@
 {
     RT_NOREF(u32ClientId);
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     LogFlow(("USBClientResponseCallback: id = %d, pv = %p, code = %d, pvRet = %p, cbRet = %d\n",
@@ -169 +169 @@
         case VRDE_USB_REQ_DEVICE_LIST:
         {
-            rc = pThis->saveDeviceList(pvRet, cbRet);
+            vrc = pThis->saveDeviceList(pvRet, cbRet);
         } break;
 
@@ -178 +178 @@
                 VRDEUSBREQNEGOTIATERET *pret = (VRDEUSBREQNEGOTIATERET *)pvRet;
 
-                rc = pThis->negotiateResponse(pret, cbRet);
+                vrc = pThis->negotiateResponse(pret, cbRet);
             }
             else
@@ -185 +185 @@
                      pvRet, cbRet, sizeof(VRDEUSBREQNEGOTIATERET)));
 
-                rc = VERR_INVALID_PARAMETER;
+                vrc = VERR_INVALID_PARAMETER;
             }
         } break;
@@ -191 +191 @@
         case VRDE_USB_REQ_REAP_URB:
         {
-            rc = pThis->reapURB(pvRet, cbRet);
-
-            LogFlow(("USBClientResponseCallback: reap URB, rc = %Rrc.\n", rc));
+            vrc = pThis->reapURB(pvRet, cbRet);
+
+            LogFlow(("USBClientResponseCallback: reap URB, rc = %Rrc.\n", vrc));
         } break;
 
@@ -226 +226 @@
                     {
                         Log(("USBClientResponseCallback: WARNING: invalid device id %08X.\n", pret->id));
-                        rc = VERR_INVALID_PARAMETER;
+                        vrc = VERR_INVALID_PARAMETER;
                     }
                     else
@@ -248 +248 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -258 +258 @@
 {
     RT_NOREF(cbAddress);
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     RemoteUSBBackend *pThis = (RemoteUSBBackend *)pInstance;
@@ -266 +266 @@
     if (!pDevice)
     {
-        rc = VERR_NO_MEMORY;
+        vrc = VERR_NO_MEMORY;
     }
     else
@@ -277 +277 @@
         {
             AssertFailed();
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
         }
         else
@@ -285 +285 @@
             pDevice->fWokenUp = false;
 
-            rc = RTCritSectInit(&pDevice->critsect);
-            AssertRC(rc);
-
-            if (RT_SUCCESS(rc))
+            vrc = RTCritSectInit(&pDevice->critsect);
+            AssertRC(vrc);
+
+            if (RT_SUCCESS(vrc))
             {
                 pDevice->id = RTStrToUInt32(&pszAddress[REMOTE_USB_BACKEND_PREFIX_LEN]);
@@ -304 +304 @@
                     {
                         AssertFailed();
-                        rc = VERR_INVALID_PARAMETER;
+                        vrc = VERR_INVALID_PARAMETER;
                     }
                 }
@@ -310 +310 @@
                 {
                     AssertFailed();
-                    rc = VERR_INVALID_PARAMETER;
+                    vrc = VERR_INVALID_PARAMETER;
                 }
 
-                if (RT_SUCCESS(rc))
+                if (RT_SUCCESS(vrc))
                 {
                     VRDE_USB_REQ_OPEN_PARM parm;
@@ -326 +326 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         *ppDevice = pDevice;
@@ -337 +337 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -529 +529 @@
                                         uint32_t u32Len, void *pvData, void *pvURB, PREMOTEUSBQURB *ppRemoteURB)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
 #ifdef DEBUG_sunlover
@@ -551 +551 @@
     if (qurb == NULL)
     {
-        rc = VERR_NO_MEMORY;
+        vrc = VERR_NO_MEMORY;
         goto l_leave;
     }
@@ -577 +577 @@
         {
             AssertFailed();
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
             goto l_leave;
         }
@@ -602 +602 @@
         case VUSBXFERTYPE_INTR: parm.type = VRDE_USB_TRANSFER_TYPE_INTR; break;
         case VUSBXFERTYPE_MSG:  parm.type = VRDE_USB_TRANSFER_TYPE_MSG;  break;
-        default: AssertFailed(); rc = VERR_INVALID_PARAMETER; goto l_leave;
+        default: AssertFailed(); vrc = VERR_INVALID_PARAMETER; goto l_leave;
     }
 
@@ -612 +612 @@
         case VUSB_DIRECTION_IN:    parm.direction = VRDE_USB_DIRECTION_IN;    break;
         case VUSB_DIRECTION_OUT:   parm.direction = VRDE_USB_DIRECTION_OUT;   break;
-        default: AssertFailed(); rc = VERR_INVALID_PARAMETER; goto l_leave;
+        default: AssertFailed(); vrc = VERR_INVALID_PARAMETER; goto l_leave;
     }
 
@@ -658 +658 @@
 
 l_leave:
-    if (RT_FAILURE(rc))
+    if (RT_FAILURE(vrc))
     {
         qurbFree(qurb);
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -672 +672 @@
                                        uint32_t *pu32Len, uint32_t *pu32Err)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     LogFlow(("RemoteUSBBackend::iface_ReapURB %d ms\n", u32Millies));
@@ -794 +794 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -976 +976 @@
     Assert(server);
 
-    int rc = RTCritSectInit(&mCritsect);
-
-    if (RT_FAILURE(rc))
+    int vrc = RTCritSectInit(&mCritsect);
+
+    if (RT_FAILURE(vrc))
     {
         AssertFailed();
@@ -1015 +1015 @@
 int RemoteUSBBackend::negotiateResponse(const VRDEUSBREQNEGOTIATERET *pret, uint32_t cbRet)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     Log(("RemoteUSBBackend::negotiateResponse: flags = %02X.\n", pret->flags));
@@ -1048 +1048 @@
             {
                 LogRel(("VRDP: ERROR: unsupported remote USB protocol client version %d.\n", pret2->u32Version));
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             }
         }
@@ -1054 +1054 @@
         {
             LogRel(("VRDP: ERROR: invalid remote USB negotiate request packet size %d.\n", cbRet));
-            rc = VERR_NOT_SUPPORTED;
+            vrc = VERR_NOT_SUPPORTED;
         }
     }
@@ -1063 +1063 @@
     }
 
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         LogRel(("VRDP: remote USB protocol version %d.\n", mClientVersion));
@@ -1079 +1079 @@
             {
                 LogRel(("VRDP: ERROR: invalid remote USB negotiate request packet size %d.\n", cbRet));
-                rc = VERR_NOT_SUPPORTED;
+                vrc = VERR_NOT_SUPPORTED;
             }
         }
@@ -1086 +1086 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -1114 +1114 @@
 void RemoteUSBBackend::request(void)
 {
-    int rc = RTCritSectEnter(&mCritsect);
-    AssertRC(rc);
+    int vrc = RTCritSectEnter(&mCritsect);
+    AssertRC(vrc);
 }
 
@@ -1178 +1178 @@
 int RemoteUSBBackend::reapURB(const void *pvBody, uint32_t cbBody)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     LogFlow(("RemoteUSBBackend::reapURB: pvBody = %p, cbBody = %d\n", pvBody, cbBody));
@@ -1206 +1206 @@
         {
             LogFlow(("RemoteUSBBackend::reapURB: WARNING: invalid reply data. Skipping the reply.\n"));
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
             break;
         }
@@ -1215 +1215 @@
         {
             LogFlow(("RemoteUSBBackend::reapURB: WARNING: invalid device id. Skipping the reply.\n"));
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
             break;
         }
@@ -1385 +1385 @@
         if (cbBodySize > cbBody)
         {
-            rc = VERR_INVALID_PARAMETER;
+            vrc = VERR_INVALID_PARAMETER;
             break;
         }
@@ -1393 +1393 @@
     }
 
-    LogFlow(("RemoteUSBBackend::reapURB: returns %Rrc\n", rc));
-
-    return rc;
+    LogFlow(("RemoteUSBBackend::reapURB: returns %Rrc\n", vrc));
+
+    return vrc;
 }
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */