Changeset 62729 in vbox

Timestamp:

Jul 30, 2016 1:54:06 AM (9 years ago)

Author:

vboxsync

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

109303

Message:

Storage: warnings.

Location:

trunk/src/VBox/Storage

Files:

• VDIfVfs.cpp (modified) (1 diff)
• VDIfVfs2.cpp (modified) (2 diffs)
• testcase/VDIoBackendMem.cpp (modified) (1 diff)
• testcase/tstVD-2.cpp (modified) (3 diffs)
• testcase/tstVD.cpp (modified) (4 diffs)
• testcase/tstVDFill.cpp (modified) (2 diffs)
• testcase/tstVDSnap.cpp (modified) (4 diffs)
• testcase/vbox-img.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/VDIfVfs.cpp

@@ -65 +65 @@
 {
     /* We don't close anything. */
+    RT_NOREF1(pvThis);
     return VINF_SUCCESS;
 }

trunk/src/VBox/Storage/VDIfVfs2.cpp

@@ -167 +167 @@
                                           PFNVDCOMPLETED pfnCompleted, void **ppInt)
 {
+    RT_NOREF1(pszLocation);
     PVDIFFROMVFS pThis = (PVDIFFROMVFS)pvUser;
 
@@ -201 +202 @@
     AssertReturn(pThis->fOpened, VERR_INVALID_HANDLE);
 
-    uint32_t cRefs = RTVfsIoStrmRelease(pThis->hVfsIos);
+    RTVfsIoStrmRelease(pThis->hVfsIos);
     pThis->hVfsIos = NIL_RTVFSIOSTREAM;
 

trunk/src/VBox/Storage/testcase/VDIoBackendMem.cpp

@@ -200 +200 @@
 {
     PVDIOBACKENDMEM pIoBackend = (PVDIOBACKENDMEM)pvUser;
+    RT_NOREF1(hThread);
 
     while (pIoBackend->fRunning)

trunk/src/VBox/Storage/testcase/tstVD-2.cpp

@@ -46 +46 @@
 static DECLCALLBACK(bool) tstAreKeysValid(void *pvUser, const char *pszzValid)
 {
+    RT_NOREF2(pvUser, pszzValid);
     return true;
 }
@@ -59 +60 @@
 static DECLCALLBACK(int) tstQuerySize(void *pvUser, const char *pszName, size_t *pcbValue)
 {
+    RT_NOREF1(pvUser);
     const char *pszValue = tstGetValueByKey(pszName);
     if (!pszValue)
@@ -68 +70 @@
 static DECLCALLBACK(int) tstQuery(void *pvUser, const char *pszName, char *pszValue, size_t cchValue)
 {
+    RT_NOREF1(pvUser);
     const char *pszTmp = tstGetValueByKey(pszName);
     if (!pszValue)

trunk/src/VBox/Storage/testcase/tstVD.cpp

@@ -48 +48 @@
 static DECLCALLBACK(void) tstVDError(void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     g_cErrors++;
     RTPrintf("tstVD: Error %Rrc at %s:%u (%s): ", rc, RT_SRC_POS_ARGS);
@@ -56 +57 @@
 static DECLCALLBACK(int) tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     RTPrintf("tstVD: ");
     RTPrintfV(pszFormat, va);
@@ -120 +122 @@
 {
     int rc;
-    PVBOXHDD pVD = NULL;
-    VDGEOMETRY       PCHS = { 0, 0, 0 };
-    VDGEOMETRY       LCHS = { 0, 0, 0 };
+    PVBOXHDD         pVD = NULL;
     PVDINTERFACE     pVDIfs = NULL;
     VDINTERFACEERROR VDIfError;
@@ -404 +404 @@
 static void mergeSegments(PSEGMENT pBaseSegment, PSEGMENT pDiffSegment, PSEGMENT pMergeSegment, uint32_t u32MaxLength)
 {
+    RT_NOREF1(u32MaxLength);
+
     while (pBaseSegment->u32Length > 0 || pDiffSegment->u32Length > 0)
     {

trunk/src/VBox/Storage/testcase/tstVDFill.cpp

@@ -42 +42 @@
 static DECLCALLBACK(void) tstVDError(void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     g_cErrors++;
     RTPrintf("tstVDFill: Error %Rrc at %s:%u (%s): ", rc, RT_SRC_POS_ARGS);
@@ -50 +51 @@
 static DECLCALLBACK(int) tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     RTPrintf("tstVDFill: ");
     RTPrintfV(pszFormat, va);

trunk/src/VBox/Storage/testcase/tstVDSnap.cpp

@@ -86 +86 @@
 static DECLCALLBACK(void) tstVDError(void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     g_cErrors++;
     RTPrintf("tstVDSnap: Error %Rrc at %s:%u (%s): ", rc, RT_SRC_POS_ARGS);
@@ -94 +95 @@
 static DECLCALLBACK(int) tstVDMessage(void *pvUser, const char *pszFormat, va_list va)
 {
+    RT_NOREF1(pvUser);
     RTPrintf("tstVDSnap: ");
     RTPrintfV(pszFormat, va);
@@ -123 +125 @@
 }
 
-static int tstVDSnapWrite(PVBOXHDD pVD, PVDDISKSEG paDiskSegments,
-                          uint32_t cDiskSegments, uint64_t cbDisk, bool fInit)
-{
+static int tstVDSnapWrite(PVBOXHDD pVD, PVDDISKSEG paDiskSegments, uint32_t cDiskSegments, uint64_t cbDisk, bool fInit)
+{
+    RT_NOREF1(cbDisk);
     int rc = VINF_SUCCESS;
 
@@ -152 +154 @@
 static int tstVDSnapReadVerify(PVBOXHDD pVD, PVDDISKSEG paDiskSegments, uint32_t cDiskSegments, uint64_t cbDisk)
 {
+    RT_NOREF1(cbDisk);
     int rc = VINF_SUCCESS;
     uint8_t *pbBuf = (uint8_t *)RTMemAlloc(_1M);

trunk/src/VBox/Storage/testcase/vbox-img.cpp

@@ -111 +111 @@
 static DECLCALLBACK(void) handleVDError(void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszFormat, va_list va)
 {
-    NOREF(pvUser);
-    NOREF(rc);
+    RT_NOREF2(pvUser, rc);
+    RT_SRC_POS_NOREF();
     RTMsgErrorV(pszFormat, va);
 }
@@ -477 +477 @@
                                     void **ppStorage)
 {
-    NOREF(pvUser);
+    RT_NOREF2(pvUser, pszLocation);
+
     /* Validate input. */
     AssertPtrReturn(ppStorage, VERR_INVALID_POINTER);
@@ -670 +671 @@
                                      void **ppStorage)
 {
-    NOREF(pvUser);
+    RT_NOREF2(pvUser, pszLocation);
+
     /* Validate input. */
     AssertPtrReturn(ppStorage, VERR_INVALID_POINTER);
@@ -1438 +1440 @@
 static DECLCALLBACK(bool) vdIfCfgCreateBaseAreKeysValid(void *pvUser, const char *pszzValid)
 {
-    return VINF_SUCCESS; /** @todo: Implement. */
+    RT_NOREF2(pvUser, pszzValid);
+    return VINF_SUCCESS; /** @todo Implement. */
 }
 
@@ -1578 +1581 @@
 {
     int rc = VINF_SUCCESS;
-    PVBOXHDD pDisk = NULL;
     const char *pszFilename = NULL;
     char *pszBackend = NULL;
@@ -1647 +1649 @@
     PVBOXHDD pDisk = NULL;
     const char *pszFilename = NULL;
-    bool fDryRun = false;
 
     /* Parse the command line. */
@@ -1706 +1707 @@
     const char *pszFilename = NULL;
     uint64_t    cbNew = 0;
-    bool fDryRun = false;
     VDGEOMETRY LCHSGeometry, PCHSGeometry;