Changeset 92925 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

Timestamp:

Dec 15, 2021 11:52:10 AM (3 years ago)

Author:

vboxsync

Message:

Additions/Shared Clipboard: GCC 11 fixes (warnings as errors, error: this ‘if’ clause does not guard... [-Werror=misleading-indentation]).

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -637 +637 @@
         rc = Msg.ReqParms.fRoots.GetUInt32(&pRootListHdr->fRoots); AssertRC(rc);
         if (RT_SUCCESS(rc))
-            rc = Msg.cRoots.GetUInt32(&pRootListHdr->cRoots); AssertRC(rc);
+        {
+            rc = Msg.cRoots.GetUInt32(&pRootListHdr->cRoots);
+            AssertRC(rc);
+        }
     }
 
@@ -780 +783 @@
         rc = Msg.uContext.GetUInt64(&pCtx->idContext); AssertRC(rc);
         if (RT_SUCCESS(rc))
-            rc = Msg.enmDir.GetUInt32((uint32_t *)pEnmDir); AssertRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = Msg.enmStatus.GetUInt32(&pReport->uStatus); AssertRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = Msg.rc.GetUInt32((uint32_t *)&pReport->rc); AssertRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = Msg.fFlags.GetUInt32(&pReport->fFlags); AssertRC(rc);
+        {
+            rc = Msg.enmDir.GetUInt32((uint32_t *)pEnmDir);
+            AssertRC(rc);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.enmStatus.GetUInt32(&pReport->uStatus);
+            AssertRC(rc);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.rc.GetUInt32((uint32_t *)&pReport->rc);
+            AssertRC(rc);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.fFlags.GetUInt32(&pReport->fFlags);
+            AssertRC(rc);
+        }
     }
 
@@ -853 +868 @@
         rc = Msg.ReqParms.uContext.GetUInt64(&pCtx->idContext); AssertRC(rc);
         if (RT_SUCCESS(rc))
-            rc = Msg.ReqParms.fRoots.GetUInt32(pfRoots); AssertRC(rc);
+        {
+            rc = Msg.ReqParms.fRoots.GetUInt32(pfRoots);
+            AssertRC(rc);
+        }
     }
 
@@ -914 +932 @@
         rc = Msg.Parms.uContext.GetUInt64(&pCtx->idContext); AssertRC(rc);
         if (RT_SUCCESS(rc))
-            rc = Msg.Parms.fInfo.GetUInt32(pfInfo); AssertRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = Msg.Parms.uIndex.GetUInt32(puIndex); AssertRC(rc);
+        {
+            rc = Msg.Parms.fInfo.GetUInt32(pfInfo);
+            AssertRC(rc);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.Parms.uIndex.GetUInt32(puIndex);
+            AssertRC(rc);
+        }
     }
 
@@ -1076 +1100 @@
         rc = Msg.uContext.GetUInt64(&pCtx->idContext);
         if (RT_SUCCESS(rc))
-            rc = Msg.uHandle.GetUInt64(phList); AssertRC(rc);
+        {
+            rc = Msg.uHandle.GetUInt64(phList);
+            AssertRC(rc);
+        }
     }
 
@@ -1310 +1337 @@
         rc = Msg.ReqParms.uContext.GetUInt64(&pCtx->idContext);
         if (RT_SUCCESS(rc))
-            rc = Msg.ReqParms.uHandle.GetUInt64(phList); AssertRC(rc);
-        if (RT_SUCCESS(rc))
-            rc = Msg.ReqParms.fInfo.GetUInt32(pfInfo); AssertRC(rc);
+        {
+            rc = Msg.ReqParms.uHandle.GetUInt64(phList);
+            AssertRC(rc);
+        }
+        if (RT_SUCCESS(rc))
+        {
+            rc = Msg.ReqParms.fInfo.GetUInt32(pfInfo);
+            AssertRC(rc);
+        }
     }