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

Timestamp:

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

Author:

vboxsync

Message:

NetworkServices: warnings

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetBaseService.cpp (modified) (3 diffs)
• VBoxNetBaseService.h (modified) (1 diff)
• VBoxNetIntIf.cpp (modified) (1 diff)
• VBoxNetPortForwardString.cpp (modified) (1 diff)

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;