儲存庫 vbox 的更動 18459

時間撮記:

2009-3-28 上午04:54:55 (16 年 以前)

作者:

vboxsync

訊息:

SrvIntNetR0: size_t warnings.

檔案:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (修改) (6 筆差異)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -1175 +1175 @@
      */
     PCRTNETIPV4 pIpHdr = (PCRTNETIPV4)((PCRTNETETHERHDR)pSG->aSegs[0].pv + 1);
-    size_t cbPacket = pSG->cbTotal - sizeof(RTNETETHERHDR);
+    uint32_t cbPacket = pSG->cbTotal - sizeof(RTNETETHERHDR);
     if (pSG->cSegsUsed > 1)
     {
@@ -1194 +1194 @@
         return;
     }
-    size_t cbIpHdr = pIpHdr->ip_hl * 4;
+    uint32_t cbIpHdr = pIpHdr->ip_hl * 4;
 
     /*
@@ -1225 +1225 @@
      * Copy to temporary buffer if necessary.
      */
-    size_t cbPacket = RT_MIN(pSG->cbTotal, sizeof(RTNETARPIPV4));
+    uint32_t cbPacket = RT_MIN(pSG->cbTotal, sizeof(RTNETARPIPV4));
     PCRTNETARPIPV4 pArpIPv4 = (PCRTNETARPIPV4)((uintptr_t)pSG->aSegs[0].pv + sizeof(RTNETETHERHDR));
     if (    pSG->cSegsUsed != 1
@@ -1979 +1979 @@
      */
     PCRTNETIPV4 pIpHdr = (PCRTNETIPV4)((PCRTNETETHERHDR)pSG->aSegs[0].pv + 1);
-    size_t cbPacket = pSG->cbTotal - sizeof(RTNETETHERHDR);
+    uint32_t cbPacket = pSG->cbTotal - sizeof(RTNETETHERHDR);
     if (pSG->cSegsUsed > 1)
     {
@@ -2035 +2035 @@
                 /* Patch flags */
                 uint16_t uFlags = pDhcp->bp_flags | RT_H2BE_U16_C(RTNET_DHCP_FLAG_BROADCAST);
-                intnetR0SgWritePart(pSG, (uint8_t*)&pDhcp->bp_flags - (uint8_t*)pIpHdr + sizeof(RTNETETHERHDR), sizeof(uFlags), &uFlags);
+                intnetR0SgWritePart(pSG, (uintptr_t)&pDhcp->bp_flags - (uintptr_t)pIpHdr + sizeof(RTNETETHERHDR), sizeof(uFlags), &uFlags);
                 /* Patch UDP checksum */
                 uint32_t uChecksum = (uint32_t)~pUdpHdr->uh_sum + RT_H2BE_U16_C(RTNET_DHCP_FLAG_BROADCAST);
@@ -2041 +2041 @@
                     uChecksum = (uChecksum >> 16) + (uChecksum & 0xFFFF);
                 uChecksum = ~uChecksum;
-                intnetR0SgWritePart(pSG, (uint8_t*)&pUdpHdr->uh_sum - (uint8_t*)pIpHdr + sizeof(RTNETETHERHDR), sizeof(pUdpHdr->uh_sum), &uChecksum);
+                intnetR0SgWritePart(pSG, (uintptr_t)&pUdpHdr->uh_sum - (uintptr_t)pIpHdr + sizeof(RTNETETHERHDR), sizeof(pUdpHdr->uh_sum), &uChecksum);
             }
             break;