Changeset 94917 in vbox

Timestamp:

May 8, 2022 7:39:41 PM (3 years ago)

Author:

vboxsync

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

151325

Message:

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

File:

• trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp (modified) (11 diffs)

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

@@ -205 +205 @@
     {
         char ch;
-        int rc = RTTcpRead(hSocket, &ch, sizeof(ch), NULL);
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("Teleporter: RTTcpRead -> %Rrc while reading string ('%s')\n", rc, pszStart));
-            return rc;
+        int vrc = RTTcpRead(hSocket, &ch, sizeof(ch), NULL);
+        if (RT_FAILURE(vrc))
+        {
+            LogRel(("Teleporter: RTTcpRead -> %Rrc while reading string ('%s')\n", vrc, pszStart));
+            return vrc;
         }
         if (    ch == '\n'
@@ -328 +328 @@
         Hdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
         Hdr.cb       = RT_MIN((uint32_t)cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
-        int rc = RTTcpSgWriteL(pState->mhSocket, 2, &Hdr, sizeof(Hdr), pvBuf, (size_t)Hdr.cb);
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("Teleporter/TCP: Write error: %Rrc (cb=%#x)\n", rc, Hdr.cb));
-            return rc;
+        int vrc = RTTcpSgWriteL(pState->mhSocket, 2, &Hdr, sizeof(Hdr), pvBuf, (size_t)Hdr.cb);
+        if (RT_FAILURE(vrc))
+        {
+            LogRel(("Teleporter/TCP: Write error: %Rrc (cb=%#x)\n", vrc, Hdr.cb));
+            return vrc;
         }
         pState->moffStream += Hdr.cb;
@@ -358 +358 @@
 static int teleporterTcpReadSelect(TeleporterState *pState)
 {
-    int rc;
+    int vrc;
     do
     {
-        rc = RTTcpSelectOne(pState->mhSocket, 1000);
-        if (RT_FAILURE(rc) && rc != VERR_TIMEOUT)
+        vrc = RTTcpSelectOne(pState->mhSocket, 1000);
+        if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
         {
             pState->mfIOError = true;
-            LogRel(("Teleporter/TCP: Header select error: %Rrc\n", rc));
+            LogRel(("Teleporter/TCP: Header select error: %Rrc\n", vrc));
             break;
         }
         if (pState->mfStopReading)
         {
-            rc = VERR_EOF;
+            vrc = VERR_EOF;
             break;
         }
-    } while (rc == VERR_TIMEOUT);
-    return rc;
+    } while (vrc == VERR_TIMEOUT);
+    return vrc;
 }
 
@@ -389 +389 @@
     for (;;)
     {
-        int rc;
+        int vrc;
 
         /*
@@ -407 +407 @@
         if (!pState->mcbReadBlock)
         {
-            rc = teleporterTcpReadSelect(pState);
-            if (RT_FAILURE(rc))
-                return rc;
+            vrc = teleporterTcpReadSelect(pState);
+            if (RT_FAILURE(vrc))
+                return vrc;
             TELEPORTERTCPHDR Hdr;
-            rc = RTTcpRead(pState->mhSocket, &Hdr, sizeof(Hdr), NULL);
-            if (RT_FAILURE(rc))
+            vrc = RTTcpRead(pState->mhSocket, &Hdr, sizeof(Hdr), NULL);
+            if (RT_FAILURE(vrc))
             {
                 pState->mfIOError = true;
-                LogRel(("Teleporter/TCP: Header read error: %Rrc\n", rc));
-                return rc;
+                LogRel(("Teleporter/TCP: Header read error: %Rrc\n", vrc));
+                return vrc;
             }
 
@@ -445 +445 @@
          * Read more data.
          */
-        rc = teleporterTcpReadSelect(pState);
-        if (RT_FAILURE(rc))
-            return rc;
+        vrc = teleporterTcpReadSelect(pState);
+        if (RT_FAILURE(vrc))
+            return vrc;
         uint32_t cb = (uint32_t)RT_MIN(pState->mcbReadBlock, cbToRead);
-        rc = RTTcpRead(pState->mhSocket, pvBuf, cb, pcbRead);
-        if (RT_FAILURE(rc))
+        vrc = RTTcpRead(pState->mhSocket, pvBuf, cb, pcbRead);
+        if (RT_FAILURE(vrc))
         {
             pState->mfIOError = true;
-            LogRel(("Teleporter/TCP: Data read error: %Rrc (cb=%#x)\n", rc, cb));
-            return rc;
+            LogRel(("Teleporter/TCP: Data read error: %Rrc (cb=%#x)\n", vrc, cb));
+            return vrc;
         }
         if (pcbRead)
@@ -515 +515 @@
     {
         /* Poll for incoming NACKs and errors from the other side */
-        int rc = RTTcpSelectOne(pState->mhSocket, 0);
-        if (rc != VERR_TIMEOUT)
-        {
-            if (RT_SUCCESS(rc))
+        int vrc = RTTcpSelectOne(pState->mhSocket, 0);
+        if (vrc != VERR_TIMEOUT)
+        {
+            if (RT_SUCCESS(vrc))
             {
                 LogRel(("Teleporter/TCP: Incoming data detect by IsOk, assuming it is a cancellation NACK.\n"));
-                rc = VERR_SSM_CANCELLED;
+                vrc = VERR_SSM_CANCELLED;
             }
             else
-                LogRel(("Teleporter/TCP: RTTcpSelectOne -> %Rrc (IsOk).\n", rc));
-            return rc;
+                LogRel(("Teleporter/TCP: RTTcpSelectOne -> %Rrc (IsOk).\n", vrc));
+            return vrc;
         }
     }
@@ -545 +545 @@
         EofHdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
         EofHdr.cb       = fCancelled ? UINT32_MAX : 0;
-        int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("Teleporter/TCP: EOF Header write error: %Rrc\n", rc));
-            return rc;
+        int vrc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
+        if (RT_FAILURE(vrc))
+        {
+            LogRel(("Teleporter/TCP: EOF Header write error: %Rrc\n", vrc));
+            return vrc;
         }
     }
@@ -906 +906 @@
                         {
                             autoLock.release();
-                            int rc = pState->mpVMM->pfnVMR3Resume(pState->mpUVM, VMRESUMEREASON_TELEPORT_FAILED);
-                            AssertLogRelMsgRC(rc, ("VMR3Resume -> %Rrc\n", rc));
+                            int vrc = pState->mpVMM->pfnVMR3Resume(pState->mpUVM, VMRESUMEREASON_TELEPORT_FAILED);
+                            AssertLogRelMsgRC(vrc, ("VMR3Resume -> %Rrc\n", vrc));
                             autoLock.acquire();
                         }
@@ -1220 +1220 @@
 static int teleporterTcpWriteACK(TeleporterStateTrg *pState, bool fAutomaticUnlock = true)
 {
-    int rc = RTTcpWrite(pState->mhSocket, "ACK\n", sizeof("ACK\n") - 1);
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("Teleporter: RTTcpWrite(,ACK,) -> %Rrc\n", rc));
+    int vrc = RTTcpWrite(pState->mhSocket, "ACK\n", sizeof("ACK\n") - 1);
+    if (RT_FAILURE(vrc))
+    {
+        LogRel(("Teleporter: RTTcpWrite(,ACK,) -> %Rrc\n", vrc));
         if (fAutomaticUnlock)
             teleporterTrgUnlockMedia(pState);
     }
-    return rc;
+    return vrc;
 }
 
@@ -1250 +1250 @@
     else
         cch = RTStrPrintf(szMsg, sizeof(szMsg), "NACK=%d\n", rc2);
-    int rc = RTTcpWrite(pState->mhSocket, szMsg, cch);
-    if (RT_FAILURE(rc))
-        LogRel(("Teleporter: RTTcpWrite(,%s,%zu) -> %Rrc\n", szMsg, cch, rc));
-    return rc;
+    int vrc = RTTcpWrite(pState->mhSocket, szMsg, cch);
+    if (RT_FAILURE(vrc))
+        LogRel(("Teleporter: RTTcpWrite(,%s,%zu) -> %Rrc\n", szMsg, cch, vrc));
+    return vrc;
 }