Changeset 33659 in vbox

Timestamp:

Nov 1, 2010 2:46:15 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: cleanup

File:

• trunk/src/VBox/Main/ApplianceImplIO.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ApplianceImplIO.cpp

@@ -493 +493 @@
                 size_t cbAvail = RTCircBufUsed(pInt->pCircBuf);
                 size_t cbMemAllRead = 0;
-                bool fStop = false;
-                bool fEOF = false;
                 /* First loop over all the free memory in the circular
                  * memory buffer (could be turn around at the end). */
@@ -500 +498 @@
                 {
                     if (   cbMemAllRead == cbAvail
-                        || fStop == true)
+                        || fLoop == false)
                         break;
                     char *pcBuf;
@@ -521 +519 @@
                         if (RT_FAILURE(rc))
                         {
-                            fStop = true;
                             fLoop = false;
-                            break;
-                        }
-                        if (cbWritten == 0)
-                        {
-                            fStop = true;
-                            fLoop = false;
-                            fEOF = true;
-//                            RTPrintf("EOF\n");
                             break;
                         }
@@ -537 +526 @@
                     }
                     /* Update the SHA1 context with the next data block. */
-                    if (pInt->pSha1Storage->fCreateDigest)
+                    if (   RT_SUCCESS(rc)
+                        && pInt->pSha1Storage->fCreateDigest)
                         RTSha1Update(&pInt->ctx, pcBuf, cbAllWritten);
                     /* Mark the block as empty. */
@@ -554 +544 @@
                 size_t cbAvail = RTCircBufFree(pInt->pCircBuf);
                 size_t cbMemAllWrite = 0;
-                bool fStop = false;
-                bool fEOF = false;
                 /* First loop over all the available memory in the circular
                  * memory buffer (could be turn around at the end). */
@@ -561 +549 @@
                 {
                     if (   cbMemAllWrite == cbAvail
-                        || fStop == true)
+                        || fLoop == false)
                         break;
                     char *pcBuf;
@@ -582 +570 @@
                         if (RT_FAILURE(rc))
                         {
-                            fStop = true;
                             fLoop = false;
                             break;
                         }
+                        /* This indicates end of file. Stop reading. */
                         if (cbRead == 0)
                         {
-                            fStop = true;
                             fLoop = false;
-                            fEOF = true;
-//                            RTPrintf("EOF\n");
+                            ASMAtomicWriteBool(&pInt->fEOF, true);
                             break;
                         }
@@ -598 +584 @@
                     }
                     /* Update the SHA1 context with the next data block. */
-                    if (pInt->pSha1Storage->fCreateDigest)
+                    if (   RT_SUCCESS(rc)
+                        && pInt->pSha1Storage->fCreateDigest)
                         RTSha1Update(&pInt->ctx, pcBuf, cbAllRead);
                     /* Mark the block as full. */
@@ -604 +591 @@
                     cbMemAllWrite += cbAllRead;
                 }
-                if (fEOF)
-                    ASMAtomicWriteBool(&pInt->fEOF, true);
                 /* Reset the thread status and signal the main thread that we
                  * are finished. Use CmpXchg, so we not overwrite other states