Changeset 63267 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Aug 10, 2016 1:34:15 PM (9 years ago)

Author:

vboxsync

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

109900

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/NetworkServices

Files:

• NAT/VBoxNetLwipNAT.cpp (modified) (7 diffs)
• NetLib/VBoxNetBaseService.cpp (modified) (3 diffs)
• NetLib/VBoxNetBaseService.h (modified) (1 diff)
• NetLib/VBoxNetIntIf.cpp (modified) (1 diff)
• NetLib/VBoxNetPortForwardString.cpp (modified) (1 diff)

trunk/src/VBox/NetworkServices/NAT/VBoxNetLwipNAT.cpp

@@ -415 +415 @@
             break;
         }
+
+        default: break; /* Shut up MSC. */
     }
     return hrc;
@@ -426 +428 @@
 
     HRESULT hrc = com::Initialize();
-    Assert(!FAILED(hrc));
+    Assert(!FAILED(hrc)); NOREF(hrc);
 
     proxy_arp_hook = pxremap_proxy_arp;
@@ -516 +518 @@
 {
     AssertPtrReturnVoid(arg);
-    VBoxNetLwipNAT *pThis = (VBoxNetLwipNAT *)arg;
 
     /* XXX: proxy finalization */
@@ -998 +999 @@
             RT_ZERO(Rule);
 
-            int irc = netPfStrToPf(Val.psz, (rc == 'P'), &Rule.Pfr);
+            int rc2 = netPfStrToPf(Val.psz, (rc == 'P'), &Rule.Pfr);
+            RT_NOREF_PV(rc2);
             rules.push_back(Rule);
             return VINF_SUCCESS;
@@ -1013 +1015 @@
     AssertReturn(cbFrame != 0, VERR_INVALID_PARAMETER);
 
-    struct pbuf *p = pbuf_alloc(PBUF_RAW, cbFrame + ETH_PAD_SIZE, PBUF_POOL);
+    struct pbuf *p = pbuf_alloc(PBUF_RAW, (u16_t)cbFrame + ETH_PAD_SIZE, PBUF_POOL);
     if (RT_UNLIKELY(p == NULL))
         return VERR_NO_MEMORY;
@@ -1049 +1051 @@
 int VBoxNetLwipNAT::processGSO(PCPDMNETWORKGSO pGso, size_t cbFrame)
 {
-    if (!PDMNetGsoIsValid(pGso, cbFrame,
-                          cbFrame - sizeof(PDMNETWORKGSO)))
+    if (!PDMNetGsoIsValid(pGso, cbFrame, cbFrame - sizeof(PDMNETWORKGSO)))
         return VERR_INVALID_PARAMETER;
 
@@ -1057 +1058 @@
     uint32_t const  cSegs = PDMNetGsoCalcSegmentCount(pGso,
                                                       cbFrame);
-    for (size_t iSeg = 0; iSeg < cSegs; iSeg++)
+    for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
     {
         uint32_t cbSegFrame;
-        void    *pvSegFrame =
-          PDMNetGsoCarveSegmentQD(pGso,
-                                  (uint8_t *)(pGso + 1),
-                                  cbFrame,
-                                  abHdrScratch,
-                                  iSeg,
-                                  cSegs,
-                                  &cbSegFrame);
+        void    *pvSegFrame = PDMNetGsoCarveSegmentQD(pGso,
+                                                      (uint8_t *)(pGso + 1),
+                                                      cbFrame,
+                                                      abHdrScratch,
+                                                      iSeg,
+                                                      cSegs,
+                                                      &cbSegFrame);
 
         int rc = processFrame(pvSegFrame, cbSegFrame);

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp

@@ -533 +533 @@
 
 /* S/G API */
-int VBoxNetBaseService::sendBufferOnWire(PCINTNETSEG pcSg, int cSg, size_t cbFrame)
-{
+int VBoxNetBaseService::sendBufferOnWire(PCINTNETSEG paSegs, size_t cSegs, size_t cbFrame)
+{
+    /* Allocate frame */
     PINTNETHDR pHdr = NULL;
-    uint8_t *pu8Frame = NULL;
-
-    /* Allocate frame */
-    int rc = IntNetRingAllocateFrame(&m->m_pIfBuf->Send, cbFrame, &pHdr, (void **)&pu8Frame);
+    uint8_t *pbFrame = NULL;
+    int rc = IntNetRingAllocateFrame(&m->m_pIfBuf->Send, (uint32_t)cbFrame, &pHdr, (void **)&pbFrame);
     AssertRCReturn(rc, rc);
 
     /* Now we fill pvFrame with S/G above */
-    int offFrame = 0;
-    for (int idxSg = 0; idxSg < cSg; ++idxSg)
-    {
-        memcpy(&pu8Frame[offFrame], pcSg[idxSg].pv, pcSg[idxSg].cb);
-        offFrame+=pcSg[idxSg].cb;
+    size_t offFrame = 0;
+    for (size_t idxSeg = 0; idxSeg < cSegs; ++idxSeg)
+    {
+        memcpy(&pbFrame[offFrame], paSegs[idxSeg].pv, paSegs[idxSeg].cb);
+        offFrame += paSegs[idxSeg].cb;
     }
 
@@ -817 +816 @@
 void VBoxNetBaseService::debugPrintV(int iMinLevel, bool fMsg, const char *pszFmt, va_list va) const
 {
+    RT_NOREF(fMsg);
     if (iMinLevel <= m->m_cVerbosity)
     {
@@ -840 +840 @@
     {
         PRTGETOPTDEF pOpt = m->m_vecOptionDefs[i];
-        memcpy(&pOptArray[i], m->m_vecOptionDefs[i], sizeof(RTGETOPTDEF));
+        memcpy(&pOptArray[i], pOpt, sizeof(*pOpt));
     }
     return pOptArray;

trunk/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h

@@ -70 +70 @@
     int                 waitForIntNetEvent(int cMillis);
     int                 abortWait();
-    int                 sendBufferOnWire(PCINTNETSEG pSg, int cSg, size_t cbBuffer);
+    int                 sendBufferOnWire(PCINTNETSEG paSegs, size_t cSegs, size_t cbBuffer);
     void                flushWire();
 

trunk/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp

@@ -80 +80 @@
 int VBoxNetIntIfRingWriteFrame(PINTNETBUF pBuf, PINTNETRINGBUF pRingBuf, size_t cSegs, PCINTNETSEG paSegs)
 {
+    RT_NOREF(pBuf);
+
     /*
      * Validate input.

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -55 +55 @@
                                 bool fEmptyAcceptable)
 {
-    int idxRaw = 0;
     int cbField = 0;