儲存庫 vbox 的更動 62747

時間撮記:

2016-7-30 下午04:01:43 (8 年 以前)

作者:

vboxsync

訊息:

Storage: warnings.

檔案:

• trunk/src/VBox/Storage/RAW.cpp (修改) (15 筆差異)

trunk/src/VBox/Storage/RAW.cpp

@@ -234 +234 @@
                           unsigned uPercentStart, unsigned uPercentSpan)
 {
+    RT_NOREF1(pszComment);
     int rc;
     RTFOFF cbFree = 0;
@@ -307 +308 @@
                                          PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
+    RT_NOREF1(pVDIfsDisk);
     LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p\n", pszFilename, pVDIfsDisk, pVDIfsImage));
     PVDIOSTORAGE pStorage = NULL;
@@ -333 +335 @@
                            &pStorage);
     if (RT_SUCCESS(rc))
+    {
         rc = vdIfIoIntFileGetSize(pIfIo, pStorage, &cbFile);
 
-    /* Try to guess the image type based on the extension. */
-    if (   RT_SUCCESS(rc)
-        && pszSuffix)
-    {
-        if (   !RTStrICmp(pszSuffix, ".iso")
-            || !RTStrICmp(pszSuffix, ".cdr")) /* DVD images. */
+        /* Try to guess the image type based on the extension. */
+        if (   RT_SUCCESS(rc)
+            && pszSuffix)
         {
-            /* Note that there are ISO images smaller than 1 MB; it is impossible to distinguish
-             * between raw floppy and CD images based on their size (and cannot be reliably done
-             * based on contents, either).
-             */
-            if (cbFile % 2048)
-                rc = VERR_VD_RAW_SIZE_MODULO_2048;
-            else if (cbFile <= 32768)
-                rc = VERR_VD_RAW_SIZE_OPTICAL_TOO_SMALL;
+            if (   !RTStrICmp(pszSuffix, ".iso")
+                || !RTStrICmp(pszSuffix, ".cdr")) /* DVD images. */
+            {
+                /* Note that there are ISO images smaller than 1 MB; it is impossible to distinguish
+                 * between raw floppy and CD images based on their size (and cannot be reliably done
+                 * based on contents, either).
+                 */
+                if (cbFile % 2048)
+                    rc = VERR_VD_RAW_SIZE_MODULO_2048;
+                else if (cbFile <= 32768)
+                    rc = VERR_VD_RAW_SIZE_OPTICAL_TOO_SMALL;
+                else
+                {
+                    *penmType = VDTYPE_DVD;
+                    rc = VINF_SUCCESS;
+                }
+            }
+            else if (   !RTStrICmp(pszSuffix, ".img")
+                     || !RTStrICmp(pszSuffix, ".ima")
+                     || !RTStrICmp(pszSuffix, ".dsk")
+                     || !RTStrICmp(pszSuffix, ".flp")
+                     || !RTStrICmp(pszSuffix, ".vfd")) /* Floppy images */
+            {
+                if (cbFile % 512)
+                    rc = VERR_VD_RAW_SIZE_MODULO_512;
+                else if (cbFile > RAW_MAX_FLOPPY_IMG_SIZE)
+                    rc = VERR_VD_RAW_SIZE_FLOPPY_TOO_BIG;
+                else
+                {
+                    *penmType = VDTYPE_FLOPPY;
+                    rc = VINF_SUCCESS;
+                }
+            }
             else
-            {
-                *penmType = VDTYPE_DVD;
-                rc = VINF_SUCCESS;
-            }
-        }
-        else if (   !RTStrICmp(pszSuffix, ".img")
-                 || !RTStrICmp(pszSuffix, ".ima")
-                 || !RTStrICmp(pszSuffix, ".dsk")
-                 || !RTStrICmp(pszSuffix, ".flp")
-                 || !RTStrICmp(pszSuffix, ".vfd")) /* Floppy images */
-        {
-            if (cbFile % 512)
-                rc = VERR_VD_RAW_SIZE_MODULO_512;
-            else if (cbFile > RAW_MAX_FLOPPY_IMG_SIZE)
-                rc = VERR_VD_RAW_SIZE_FLOPPY_TOO_BIG;
-            else
-            {
-                *penmType = VDTYPE_FLOPPY;
-                rc = VINF_SUCCESS;
-            }
+                rc = VERR_VD_RAW_INVALID_HEADER;
         }
         else
             rc = VERR_VD_RAW_INVALID_HEADER;
     }
-    else
-        rc = VERR_VD_RAW_INVALID_HEADER;
 
     if (pStorage)
@@ -451 +455 @@
                                    void **ppBackendData)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p enmType=%u ppBackendData=%#p",
                  pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, enmType, ppBackendData));
@@ -619 +624 @@
                                   size_t *pcbPostRead, unsigned fWrite)
 {
+    RT_NOREF1(fWrite);
     int rc = VINF_SUCCESS;
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -907 +913 @@
                                        size_t cbComment)
 {
+    RT_NOREF2(pszComment, cbComment);
     LogFlowFunc(("pBackendData=%#p pszComment=%#p cbComment=%zu\n", pBackendData, pszComment, cbComment));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -925 +932 @@
 static DECLCALLBACK(int) rawSetComment(void *pBackendData, const char *pszComment)
 {
+    RT_NOREF1(pszComment);
     LogFlowFunc(("pBackendData=%#p pszComment=\"%s\"\n", pBackendData, pszComment));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -948 +956 @@
 static DECLCALLBACK(int) rawGetUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -966 +975 @@
 static DECLCALLBACK(int) rawSetUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -990 +1000 @@
 static DECLCALLBACK(int) rawGetModificationUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -1008 +1019 @@
 static DECLCALLBACK(int) rawSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -1031 +1043 @@
 static DECLCALLBACK(int) rawGetParentUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -1049 +1062 @@
 static DECLCALLBACK(int) rawSetParentUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -1072 +1086 @@
 static DECLCALLBACK(int) rawGetParentModificationUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
@@ -1090 +1105 @@
 static DECLCALLBACK(int) rawSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;