vbox的更動 39032 路徑 trunk/src/VBox/Runtime/r3/isofs.cpp

時間撮記:

2011-10-19 上午11:08:50 (13 年 以前)

作者:

vboxsync

訊息:

IPRT: Fixed unused variable warnings.

檔案:

• trunk/src/VBox/Runtime/r3/isofs.cpp (修改) (3 筆差異)

trunk/src/VBox/Runtime/r3/isofs.cpp

@@ -317 +317 @@
         rc = VERR_FILE_NOT_FOUND;
 
-        uint8_t uBuffer[RTISOFS_SECTOR_SIZE];
+        uint8_t abBuffer[RTISOFS_SECTOR_SIZE];
         size_t cbLeft = cbExtent;
         while (!RT_SUCCESS(rc) && cbLeft > 0)
         {
-            size_t cbRead;
-            int rc2 = RTFileRead(pFile->file, (void*)&uBuffer, sizeof(uBuffer), &cbRead);
-            Assert(RT_SUCCESS(rc2) && cbRead == RTISOFS_SECTOR_SIZE);
+            size_t cbRead = 0;
+            int rc2 = RTFileRead(pFile->file, &abBuffer[0], sizeof(abBuffer), &cbRead);
+            AssertRC(rc2);
+            Assert(cbRead == RTISOFS_SECTOR_SIZE);
             cbLeft -= cbRead;
 
@@ -329 +330 @@
             while (idx < cbRead)
             {
-                PRTISOFSDIRRECORD pCurRecord = (PRTISOFSDIRRECORD)&uBuffer[idx];
+                PRTISOFSDIRRECORD pCurRecord = (PRTISOFSDIRRECORD)&abBuffer[idx];
                 if (pCurRecord->record_length == 0)
                     break;
@@ -336 +337 @@
                 AssertPtr(pszName);
                 Assert(idx + sizeof(RTISOFSDIRRECORD) < cbRead);
-                memcpy(pszName, &uBuffer[idx + sizeof(RTISOFSDIRRECORD)], pCurRecord->name_len);
+                memcpy(pszName, &abBuffer[idx + sizeof(RTISOFSDIRRECORD)], pCurRecord->name_len);
                 pszName[pCurRecord->name_len] = '\0'; /* Force string termination. */