Changeset 62960 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Aug 4, 2016 8:09:34 AM (9 years ago)

Author:

vboxsync

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

109563

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBSnifferPcapNg.cpp (modified) (2 diffs)
• VUSBSnifferUsbMon.cpp (modified) (1 diff)
• VUSBSnifferVmx.cpp (modified) (3 diffs)
• VUSBUrb.cpp (modified) (6 diffs)
• VUSBUrbPool.cpp (modified) (3 diffs)

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

@@ -452 +452 @@
 static DECLCALLBACK(int) vusbSnifferFmtPcanNgInit(PVUSBSNIFFERFMTINT pThis, PVUSBSNIFFERSTRM pStrm)
 {
-    int rc = VINF_SUCCESS;
-
     pThis->pStrm       = pStrm;
     pThis->cbBlockCur  = 0;
@@ -470 +468 @@
 
     /* Write the blocks. */
-    rc = vusbSnifferBlockNew(pThis, &Shb.Hdr, sizeof(Shb));
+    int rc = vusbSnifferBlockNew(pThis, &Shb.Hdr, sizeof(Shb));
     if (RT_SUCCESS(rc))
     {

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

@@ -81 +81 @@
 static DECLCALLBACK(void) vusbSnifferFmtUsbMonDestroy(PVUSBSNIFFERFMTINT pThis)
 {
-
+    RT_NOREF(pThis);
 }
 

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

@@ -93 +93 @@
 static int vusbSnifferFmtVmxLogData(PVUSBSNIFFERFMTINT pThis, PRTTIME pTime, uint8_t *pbBuf, size_t cbBuf)
 {
-    int rc = VINF_SUCCESS;
-    char aszLineBuf[256];
-    uint16_t off = 0;
+    int rc;
+    char szLineBuf[256];
+    size_t off = 0;
 
     do
     {
-        size_t cch = RTStrPrintf(&aszLineBuf[0], sizeof(aszLineBuf),
-                                 "%s %02u %02u:%02u:%02u.%3.*u: vmx| USBIO:  %03x: %16.*Rhxs\n",
-                                 s_apszMonths[pTime->u8Month - 1], pTime->u8MonthDay, pTime->u8Hour, pTime->u8Minute, pTime->u8Second, 3, pTime->u32Nanosecond,
+        size_t cch = RTStrPrintf(&szLineBuf[0], sizeof(szLineBuf),
+                                 "%s %02u %02u:%02u:%02u.%3.*u: vmx| USBIO:  %03zx: %16.*Rhxs\n",
+                                 s_apszMonths[pTime->u8Month - 1], pTime->u8MonthDay,
+                                 pTime->u8Hour, pTime->u8Minute, pTime->u8Second, 3, pTime->u32Nanosecond,
                                  off, RT_MIN(cbBuf - off, 16), pbBuf);
-        rc = pThis->pStrm->pfnWrite(pThis->pStrm, &aszLineBuf[0], cch);
+        rc = pThis->pStrm->pfnWrite(pThis->pStrm, &szLineBuf[0], cch);
         off   += RT_MIN(cbBuf, 16);
         pbBuf += RT_MIN(cbBuf, 16);
@@ -131 +132 @@
     RTTIMESPEC TimeNow;
     RTTIME Time;
-    char aszLineBuf[256];
+    char szLineBuf[256];
     const char *pszEvt = enmEvent == VUSBSNIFFEREVENT_SUBMIT ? "Down" : "Up";
     uint8_t cIsocPkts = pUrb->enmType == VUSBXFERTYPE_ISOC ? pUrb->cIsocPkts : 0;
@@ -138 +139 @@
         return VINF_SUCCESS;
 
-    RT_ZERO(aszLineBuf);
+    RT_ZERO(szLineBuf);
 
     RTTimeNow(&TimeNow);
     RTTimeExplode(&Time, &TimeNow);
 
-    size_t cch = RTStrPrintf(&aszLineBuf[0], sizeof(aszLineBuf),
+    size_t cch = RTStrPrintf(&szLineBuf[0], sizeof(szLineBuf),
                              "%s %02u %02u:%02u:%02u.%3.*u: vmx| USBIO: %s dev=%u endpt=%x datalen=%u numPackets=%u status=%u 0\n",
                              s_apszMonths[Time.u8Month - 1], Time.u8MonthDay, Time.u8Hour, Time.u8Minute, Time.u8Second, 3, Time.u32Nanosecond,
                              pszEvt, pUrb->DstAddress, pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0x00),
                              pUrb->cbData, cIsocPkts, pUrb->enmStatus);
-    int rc = pThis->pStrm->pfnWrite(pThis->pStrm, &aszLineBuf[0], cch);
+    int rc = pThis->pStrm->pfnWrite(pThis->pStrm, &szLineBuf[0], cch);
     if (RT_SUCCESS(rc))
     {

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

@@ -746 +746 @@
  * @param   pUrb        The URB to submit.
  */
-static void vusbMsgDoTransfer(PVUSBURB pUrb, PVUSBSETUP pSetup, PVUSBCTRLEXTRA pExtra, PVUSBPIPE pPipe, PVUSBDEV pDev)
-{
+static void vusbMsgDoTransfer(PVUSBURB pUrb, PVUSBSETUP pSetup, PVUSBCTRLEXTRA pExtra, PVUSBPIPE pPipe)
+{
+    RT_NOREF(pPipe);
+
     /*
      * Mark this transfer as sent (cleared at setup time).
@@ -904 +906 @@
             /* pre-buffer our output if it's device-to-host */
             if (pSetup->bmRequestType & VUSB_DIR_TO_HOST)
-                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe, pDev);
+                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe);
             else if (pSetup->wLength)
             {
@@ -919 +921 @@
             {
                 LogFlow(("%s: vusbUrbSubmitCtrl: stage=SETUP - to dev: sending\n", pUrb->pszDesc));
-                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe, pDev);
+                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe);
             }
             break;
@@ -992 +994 @@
                 {
                     LogFlow(("%s: vusbUrbSubmitCtrl: stage=DATA - to dev: sending\n", pUrb->pszDesc));
-                    vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe, pDev);
+                    vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe);
                     break;
                 }
@@ -1015 +1017 @@
             {
                 LogFlow(("%s: vusbUrbSubmitCtrl: stage=STATUS - to dev: sending\n", pUrb->pszDesc));
-                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe, pDev);
+                vusbMsgDoTransfer(pUrb, pSetup, pExtra, pPipe);
             }
             break;
@@ -1249 +1251 @@
     while (pVUsbUrb)
     {
-        PVUSBURB pUrb = pVUsbUrb->pUrb;
-
-        vusbUrbAssert(pUrb);
+        vusbUrbAssert(pVUsbUrb->pUrb);
         PVUSBURBVUSB pVUsbUrbNext = RTListGetNext(pUrbLst, pVUsbUrb, VUSBURBVUSBINT, NdLst);
         PVUSBDEV pDev = pVUsbUrb->pDev;

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

@@ -118 +118 @@
                                       size_t cbHciTd, unsigned cTds)
 {
+    Assert((uint32_t)cbData == cbData);
+    Assert((uint32_t)cbHci == cbHci);
+
     /*
      * Reuse or allocate a new URB.
@@ -188 +191 @@
      * (Re)init the URB
      */
-    uint32_t offAlloc = cbData;
+    uint32_t offAlloc = (uint32_t)cbData;
     PVUSBURB pUrb = &pHdr->Urb;
     pUrb->u32Magic               = VUSBURB_MAGIC;
@@ -204 +207 @@
     pUrb->Dev.pvPrivate          = NULL;
     pUrb->Dev.pNext              = NULL;
-    pUrb->EndPt                  = ~0;
+    pUrb->EndPt                  = UINT8_MAX;
     pUrb->enmType                = enmType;
     pUrb->enmDir                 = enmDir;
     pUrb->fShortNotOk            = false;
     pUrb->enmStatus              = VUSBSTATUS_INVALID;
-    pUrb->cbData                 = cbData;
+    pUrb->cbData                 = (uint32_t)cbData;
     pUrb->pHci                   = cbHci ? (PVUSBURBHCI)&pUrb->abData[offAlloc] : NULL;
-    offAlloc += cbHci;
+    offAlloc += (uint32_t)cbHci;
     pUrb->paTds                  = (cbHciTd && cTds) ? (PVUSBURBHCITD)&pUrb->abData[offAlloc] : NULL;