Changeset 70054 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 11, 2017 11:50:39 AM (7 years ago)

Author:

vboxsync

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

119593

Message:

DrvAudioCommon/DrvAudioHlpFile: Use RTFileIsValid(); minor logging adjustments.

File:

• trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp

@@ -1334 +1334 @@
     if (pFile->enmType == PDMAUDIOFILETYPE_RAW)
     {
-        if (pFile->hFile != NIL_RTFILE)
-        {
+        if (RTFileIsValid(pFile->hFile))
             rc = RTFileClose(pFile->hFile);
-            pFile->hFile = NIL_RTFILE;
-        }
     }
     else if (pFile->enmType == PDMAUDIOFILETYPE_WAV)
     {
-        if (pFile->hFile != NIL_RTFILE)
+        if (RTFileIsValid(pFile->hFile))
         {
             PAUDIOWAVFILEDATA pData = (PAUDIOWAVFILEDATA)pFile->pvData;
@@ -1352 +1349 @@
 
             rc = RTFileClose(pFile->hFile);
-            pFile->hFile = NIL_RTFILE;
         }
 
@@ -1375 +1371 @@
     if (RT_SUCCESS(rc))
     {
+        pFile->hFile = NIL_RTFILE;
         LogRel2(("Audio: Closed file '%s' (%zu bytes)\n", pFile->szName, cbSize));
     }
@@ -1394 +1391 @@
 
     int rc = RTFileDelete(pFile->szName);
+
+    if (rc == VERR_FILE_NOT_FOUND) /* Don't bitch if the file is not around (anymore). */
+        rc = VINF_SUCCESS;
+
     if (RT_FAILURE(rc))
         LogRel(("Audio: Failed deleting file '%s', rc=%Rrc\n", pFile->szName, rc));