Changeset 94958 in vbox

Timestamp:

May 9, 2022 2:09:57 PM (3 years ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp (modified) (13 diffs)

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

@@ -108 +108 @@
             /* As we need to know if the directory we were about to open exists and and is accessible,
              * do the first read here in order to return a meaningful status here. */
-            int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-            vrc = i_readInternal(mData.mObjData, &rcGuest);
+            int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+            vrc = i_readInternal(mData.mObjData, &vrcGuest);
             if (RT_FAILURE(vrc))
             {
@@ -122 +122 @@
 
                 if (vrc == VERR_GSTCTL_GUEST_ERROR)
-                    vrc = rcGuest;
+                    vrc = vrcGuest;
             }
         }
@@ -298 +298 @@
     AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
 
-    int rc = mData.mProcessTool.terminate(30 * 1000 /* 30s timeout */, prcGuest);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = mData.mProcessTool.terminate(30 * 1000 /* 30s timeout */, prcGuest);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     AssertPtr(mSession);
-    int rc2 = mSession->i_directoryUnregister(this);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
-    return rc;
+    int vrc2 = mSession->i_directoryUnregister(this);
+    if (RT_SUCCESS(vrc))
+        vrc = vrc2;
+
+    LogFlowThisFunc(("Returning vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -323 +323 @@
 
     GuestProcessStreamBlock curBlock;
-    int rc = mData.mProcessTool.waitEx(GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK, &curBlock, prcGuest);
-    if (RT_SUCCESS(rc))
+    int vrc = mData.mProcessTool.waitEx(GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK, &curBlock, prcGuest);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -331 +331 @@
          */
         if (!mData.mProcessTool.isRunning())
-            rc = mData.mProcessTool.getTerminationStatus(); /* Tool process is not running (anymore). Check termination status. */
-
-        if (RT_SUCCESS(rc))
+            vrc = mData.mProcessTool.getTerminationStatus(); /* Tool process is not running (anymore). Check termination status. */
+
+        if (RT_SUCCESS(vrc))
         {
             if (curBlock.GetCount()) /* Did we get content? */
@@ -339 +339 @@
                 if (curBlock.GetString("name"))
                 {
-                    rc = objData.FromLs(curBlock, true /* fLong */);
+                    vrc = objData.FromLs(curBlock, true /* fLong */);
                 }
                 else
-                    rc = VERR_PATH_NOT_FOUND;
+                    vrc = VERR_PATH_NOT_FOUND;
             }
             else
             {
                 /* Nothing to read anymore. Tell the caller. */
-                rc = VERR_NO_MORE_FILES;
-            }
-        }
-    }
-
-    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
-    return rc;
+                vrc = VERR_NO_MORE_FILES;
+            }
+        }
+    }
+
+    LogFlowThisFunc(("Returning vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -372 +372 @@
         return VERR_COM_UNEXPECTED;
 
-    int rc;
+    int vrc;
 
     /* If we have a valid object data cache, read from it. */
     if (mData.mObjData.mName.isNotEmpty())
     {
-        rc = fsObjInfo->init(mData.mObjData);
-        if (RT_SUCCESS(rc))
+        vrc = fsObjInfo->init(mData.mObjData);
+        if (RT_SUCCESS(vrc))
         {
             mData.mObjData.mName = ""; /* Mark the object data as being empty (beacon). */
@@ -387 +387 @@
 
         GuestFsObjData objData;
-        rc = i_readInternal(objData, prcGuest);
-        if (RT_SUCCESS(rc))
-            rc = fsObjInfo->init(objData);
-    }
-
-    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
-    return rc;
+        vrc = i_readInternal(objData, prcGuest);
+        if (RT_SUCCESS(vrc))
+            vrc = fsObjInfo->init(objData);
+    }
+
+    LogFlowThisFunc(("Returning vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -405 +405 @@
     LogFlowThisFuncEnter();
 
-    HRESULT hr = S_OK;
-
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_closeInternal(&rcGuest);
+    HRESULT hrc = S_OK;
+
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_closeInternal(&vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -415 +415 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, mData.mOpenInfo.mPath.c_str());
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Closing guest directory failed: %s"),
-                                  GuestBase::getErrorAsString(ge).c_str());
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, vrcGuest, mData.mOpenInfo.mPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Closing guest directory failed: %s"),
+                                   GuestBase::getErrorAsString(ge).c_str());
                 break;
             }
@@ -426 +426 @@
 
             default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
-                                  tr("Closing guest directory \"%s\" failed: %Rrc"), mData.mOpenInfo.mPath.c_str(), vrc);
-                break;
-        }
-    }
-
-    return hr;
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                   tr("Closing guest directory \"%s\" failed: %Rrc"), mData.mOpenInfo.mPath.c_str(), vrc);
+                break;
+        }
+    }
+
+    return hrc;
 }
 
@@ -442 +442 @@
     LogFlowThisFuncEnter();
 
-    HRESULT hr = S_OK;
+    HRESULT hrc = S_OK;
 
     ComObjPtr<GuestFsObjInfo> fsObjInfo;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_read(fsObjInfo, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_read(fsObjInfo, &vrcGuest);
     if (RT_SUCCESS(vrc))
     {
         /* Return info object to the caller. */
-        hr = fsObjInfo.queryInterfaceTo(aObjInfo.asOutParam());
+        hrc = fsObjInfo.queryInterfaceTo(aObjInfo.asOutParam());
     }
     else
@@ -458 +458 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_ToolLs, rcGuest, mData.mOpenInfo.mPath.c_str());
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Reading guest directory failed: %s"),
-                                  GuestBase::getErrorAsString(ge).c_str());
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolLs, vrcGuest, mData.mOpenInfo.mPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Reading guest directory failed: %s"),
+                                   GuestBase::getErrorAsString(ge).c_str());
                 break;
             }
             case VERR_GSTCTL_PROCESS_EXIT_CODE:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" failed: %Rrc"),
-                                  mData.mOpenInfo.mPath.c_str(), mData.mProcessTool.getRc());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" failed: %Rrc"),
+                                   mData.mOpenInfo.mPath.c_str(), mData.mProcessTool.getRc());
                 break;
 
             case VERR_PATH_NOT_FOUND:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" failed: Path not found"),
-                                  mData.mOpenInfo.mPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" failed: Path not found"),
+                                   mData.mOpenInfo.mPath.c_str());
                 break;
 
             case VERR_NO_MORE_FILES:
                 /* See SDK reference. */
-                hr = setErrorBoth(VBOX_E_OBJECT_NOT_FOUND, vrc, tr("Reading guest directory \"%s\" failed: No more entries"),
-                                  mData.mOpenInfo.mPath.c_str());
+                hrc = setErrorBoth(VBOX_E_OBJECT_NOT_FOUND, vrc, tr("Reading guest directory \"%s\" failed: No more entries"),
+                                   mData.mOpenInfo.mPath.c_str());
                 break;
 
             default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" returned error: %Rrc\n"),
-                                  mData.mOpenInfo.mPath.c_str(), vrc);
-                break;
-        }
-    }
-
-    LogFlowThisFunc(("Returning hr=%Rhrc / vrc=%Rrc\n", hr, vrc));
-    return hr;
-}
-
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Reading guest directory \"%s\" returned error: %Rrc\n"),
+                                   mData.mOpenInfo.mPath.c_str(), vrc);
+                break;
+        }
+    }
+
+    LogFlowThisFunc(("Returning hrc=%Rhrc / vrc=%Rrc\n", hrc, vrc));
+    return hrc;
+}
+