Changeset 62959 in vbox for trunk

Timestamp:

Aug 4, 2016 8:03:50 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (15 diffs)
• VUSBSniffer.cpp (modified) (1 diff)
• VUSBSnifferPcapNg.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -111 +111 @@
 }
 
-static PCVUSBDESCINTERFACEEX vusbDevFindAltIfDesc(PVUSBDEV pDev, PCVUSBINTERFACESTATE pIfState, int iAlt)
+static PCVUSBDESCINTERFACEEX vusbDevFindAltIfDesc(PCVUSBINTERFACESTATE pIfState, int iAlt)
 {
     for (uint32_t i = 0; i < pIfState->pIf->cSettings; i++)
@@ -308 +308 @@
 static bool vusbDevStdReqSetConfig(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt, pbBuf, pcbBuf);
     unsigned iCfg = pSetup->wValue & 0xff;
 
@@ -360 +361 @@
 static bool vusbDevStdReqGetConfig(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt);
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_DEVICE)
     {
@@ -402 +404 @@
 static bool vusbDevStdReqGetInterface(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt);
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_INTERFACE)
     {
@@ -448 +451 @@
 static bool vusbDevStdReqSetInterface(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt, pbBuf, pcbBuf);
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_INTERFACE)
     {
@@ -476 +480 @@
     }
     uint8_t iAlt = pSetup->wValue;
-    PCVUSBDESCINTERFACEEX pIfDesc = vusbDevFindAltIfDesc(pDev, pIfState, iAlt);
+    PCVUSBDESCINTERFACEEX pIfDesc = vusbDevFindAltIfDesc(pIfState, iAlt);
     if (!pIfDesc)
     {
@@ -510 +514 @@
 static bool vusbDevStdReqSetAddress(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt, pbBuf, pcbBuf);
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) != VUSB_TO_DEVICE)
     {
@@ -541 +546 @@
 static bool vusbDevStdReqClearFeature(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(pbBuf, pcbBuf);
     switch (pSetup->bmRequestType & VUSB_RECIP_MASK)
     {
@@ -575 +581 @@
 static bool vusbDevStdReqSetFeature(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(pDev, EndPt, pbBuf, pcbBuf);
     switch (pSetup->bmRequestType & VUSB_RECIP_MASK)
     {
@@ -599 +606 @@
 static bool vusbDevStdReqGetStatus(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt);
     if (*pcbBuf != 2)
     {
@@ -832 +840 @@
 static bool vusbDevStdReqGetDescriptor(PVUSBDEV pDev, int EndPt, PVUSBSETUP pSetup, uint8_t *pbBuf, uint32_t *pcbBuf)
 {
+    RT_NOREF(EndPt);
     if ((pSetup->bmRequestType & VUSB_RECIP_MASK) == VUSB_TO_DEVICE)
     {
@@ -1168 +1177 @@
         /* Process any URBs waiting to be cancelled first. */
         int rc = RTReqQueueProcess(pDev->hReqQueueSync, 0); /* Don't wait if there is nothing to do. */
-        Assert(RT_SUCCESS(rc) || rc == VERR_TIMEOUT);
+        Assert(RT_SUCCESS(rc) || rc == VERR_TIMEOUT); NOREF(rc);
     }
 
@@ -1357 +1366 @@
 static DECLCALLBACK(void) vusbDevResetDoneTimer(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pUsbIns, pTimer);
     PVUSBDEV        pDev  = (PVUSBDEV)pvUser;
     PVUSBRESETARGS  pArgs = (PVUSBRESETARGS)pDev->pvArgs;
@@ -1432 +1442 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) vusbIDeviceReset(PVUSBIDEVICE pDevice, bool fResetOnLinux, PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM)
-{
+static DECLCALLBACK(int) vusbIDeviceReset(PVUSBIDEVICE pDevice, bool fResetOnLinux,
+                                          PFNVUSBRESETDONE pfnDone, void *pvUser, PVM pVM)
+{
+    RT_NOREF(pVM);
     PVUSBDEV pDev = (PVUSBDEV)pDevice;
     Assert(!pfnDone || pVM);
@@ -1656 +1668 @@
         {
             int rc2 = RTReqQueueProcess(pDev->hReqQueueSync, 0);
-            Assert(RT_SUCCESS(rc2) || rc2 == VERR_TIMEOUT);
+            Assert(RT_SUCCESS(rc2) || rc2 == VERR_TIMEOUT); NOREF(rc2);
         }
         else

trunk/src/VBox/Devices/USB/VUSBSniffer.cpp

@@ -137 +137 @@
                                   const char *pszDesc)
 {
+    RT_NOREF(pszDesc);
     int rc = VINF_SUCCESS;
     PVUSBSNIFFERINT pThis = NULL;

trunk/src/VBox/Devices/USB/VUSBSnifferPcapNg.cpp

@@ -429 +429 @@
  * @param   cbOption        Size of the optiob data.
  */
-static int vusbSnifferAddOption(PVUSBSNIFFERFMTINT pThis, uint16_t u16OptionCode, const void *pvOption, uint16_t cbOption)
-{
-    int rc = VINF_SUCCESS;
+static int vusbSnifferAddOption(PVUSBSNIFFERFMTINT pThis, uint16_t u16OptionCode, const void *pvOption, size_t cbOption)
+{
+    AssertStmt((uint16_t)cbOption == cbOption, cbOption = UINT16_MAX);
     DumpFileOptionHdr OptHdr;
-
     OptHdr.u16OptionCode   = u16OptionCode;
-    OptHdr.u16OptionLength = cbOption;
-    rc = vusbSnifferBlockAddData(pThis, &OptHdr, sizeof(OptHdr));
+    OptHdr.u16OptionLength = (uint16_t)cbOption;
+    int rc = vusbSnifferBlockAddData(pThis, &OptHdr, sizeof(OptHdr));
     if (   RT_SUCCESS(rc)
         && u16OptionCode != DUMPFILE_OPTION_CODE_END
         && cbOption != 0)
     {
-        rc = vusbSnifferBlockAddData(pThis, pvOption, cbOption);
+        rc = vusbSnifferBlockAddData(pThis, pvOption, (uint16_t)cbOption);
         if (RT_SUCCESS(rc))
             rc = vusbSnifferBlockAlign(pThis);
@@ -561 +560 @@
 static DECLCALLBACK(int) vusbSnifferFmtPcanNgRecordEvent(PVUSBSNIFFERFMTINT pThis, PVUSBURB pUrb, VUSBSNIFFEREVENT enmEvent)
 {
-    int rc = VINF_SUCCESS;
     DumpFileEpb Epb;
     DumpFileUsbHeaderLnxMmapped UsbHdr;
-    DumpFileUsbSetup UsbSetup;
+    uint32_t cbCapturedLength = sizeof(UsbHdr);
+    uint8_t *pbData = NULL;
+
     RTTIMESPEC TimeNow;
-    uint64_t u64TimestampEvent;
-    size_t cbUrbLength = 0;
-    uint32_t cbDataLength = 0;
-    uint32_t cbCapturedLength = sizeof(UsbHdr);
-    uint32_t cIsocPkts = 0;
-    uint8_t *pbData = NULL;
-
     RTTimeNow(&TimeNow);
-    u64TimestampEvent = RTTimeSpecGetNano(&TimeNow);
+    uint64_t u64TimestampEvent = RTTimeSpecGetNano(&TimeNow);
 
     /* Start with the enhanced packet block. */
@@ -584 +577 @@
 
     UsbHdr.u64Id = (uint64_t)pUrb; /** @todo: check whether the pointer is a good ID. */
+    uint32_t cbUrbLength;
     switch (enmEvent)
     {
@@ -597 +591 @@
         case VUSBSNIFFEREVENT_ERROR_COMPLETE:
             UsbHdr.u8EventType = DUMPFILE_USB_EVENT_TYPE_ERROR;
+            cbUrbLength = 0;
             break;
         default:
             AssertMsgFailed(("Invalid event type %d\n", enmEvent));
-    }
-    cbDataLength = cbUrbLength;
+            cbUrbLength = 0;
+    }
+    uint32_t cbDataLength = cbUrbLength;
     pbData = &pUrb->abData[0];
 
+    uint32_t cIsocPkts = 0;
     switch (pUrb->enmType)
     {
         case VUSBXFERTYPE_ISOC:
         {
-            int32_t i32ErrorCount = 0;
+            int32_t cErrors = 0;
 
             UsbHdr.u8TransferType = 0;
@@ -615 +612 @@
                 if (   pUrb->aIsocPkts[i].enmStatus != VUSBSTATUS_OK
                     && pUrb->aIsocPkts[i].enmStatus != VUSBSTATUS_NOT_ACCESSED)
-                    i32ErrorCount++;
-
-            UsbHdr.u.IsoRec.i32ErrorCount = i32ErrorCount;
+                    cErrors++;
+
+            UsbHdr.u.IsoRec.i32ErrorCount = cErrors;
             UsbHdr.u.IsoRec.i32NumDesc    = pUrb->cIsocPkts;
             cbCapturedLength += cIsocPkts * sizeof(DumpFileUsbIsoDesc);
@@ -623 +620 @@
         }
         case VUSBXFERTYPE_BULK:
-                UsbHdr.u8TransferType = 3;
-                break;
+            UsbHdr.u8TransferType = 3;
+            break;
         case VUSBXFERTYPE_INTR:
-                UsbHdr.u8TransferType = 1;
-                break;
+            UsbHdr.u8TransferType = 1;
+            break;
         case VUSBXFERTYPE_CTRL:
         case VUSBXFERTYPE_MSG:
-                UsbHdr.u8TransferType = 2;
-                break;
+            UsbHdr.u8TransferType = 2;
+            break;
         default:
             AssertMsgFailed(("invalid transfer type %d\n", pUrb->enmType));
@@ -684 +681 @@
 
     /* Write the packet to the capture file. */
-    rc = vusbSnifferBlockNew(pThis, &Epb.Hdr, sizeof(Epb));
+    int rc = vusbSnifferBlockNew(pThis, &Epb.Hdr, sizeof(Epb));
     if (RT_SUCCESS(rc))
         rc = vusbSnifferBlockAddData(pThis, &UsbHdr, sizeof(UsbHdr));