vbox的更動 63281 路徑 trunk/src/VBox/NetworkServices

時間撮記:

2016-8-10 下午02:52:51 (8 年 以前)

作者:

vboxsync

訊息:

NetworkServices: warnings

位置:

trunk/src/VBox/NetworkServices/NAT

檔案:

• pxping_win.c (修改) (7 筆差異)
• pxtcp.c (修改) (1 筆差異)

trunk/src/VBox/NetworkServices/NAT/pxping_win.c

@@ -34 +34 @@
 
 #include <winternl.h>           /* for PIO_APC_ROUTINE &c */
+#ifndef PIO_APC_ROUTINE_DEFINED
+# define PIO_APC_ROUTINE_DEFINED 1
+#endif
 #include <iprt/win/iphlpapi.h>
 #include <icmpapi.h>
@@ -59 +62 @@
      * time and provide correct callback.
      */
-    void *callback4;
-    void *callback6;
+    PIO_APC_ROUTINE pfnCallback4;
+    PIO_APC_ROUTINE pfnCallback6;
 };
 
@@ -119 +122 @@
 
     if (osvi.dwMajorVersion >= 6) {
-        g_pxping.callback4 = (void *)pxping_icmp4_callback_apc;
-        g_pxping.callback6 = (void *)pxping_icmp6_callback_apc;
+        g_pxping.pfnCallback4 = pxping_icmp4_callback_apc;
+        g_pxping.pfnCallback6 = pxping_icmp6_callback_apc;
     }
     else {
-        g_pxping.callback4 = (void *)pxping_icmp4_callback_old;
-        g_pxping.callback6 = (void *)pxping_icmp6_callback_old;
+        g_pxping.pfnCallback4 = (PIO_APC_ROUTINE)pxping_icmp4_callback_old;
+        g_pxping.pfnCallback6 = (PIO_APC_ROUTINE)pxping_icmp6_callback_old;
     }
 
@@ -243 +246 @@
 
     status = IcmpSendEcho2(pxping->hdl4, NULL,
-                           pxping->callback4, pong,
+                           pxping->pfnCallback4, pong,
                            dst, reqdata, (WORD)reqsize, &opts,
                            pong->buf, (DWORD)pong->bufsize,
@@ -252 +255 @@
         goto out;
     }
-    else if ((status = GetLastError()) != ERROR_IO_PENDING) {
+    if ((status = GetLastError()) != ERROR_IO_PENDING) {
         int code;
 
@@ -530 +533 @@
 
     status = Icmp6SendEcho2(pxping->hdl6, NULL,
-                            pxping->callback6, pong,
+                            pxping->pfnCallback6, pong,
                             &src, &dst, reqdata, (WORD)reqsize, &opts,
                             pong->buf, (DWORD)pong->bufsize,
@@ -539 +542 @@
         goto out;
     }
-    else if ((status = GetLastError()) != ERROR_IO_PENDING) {
+    if ((status = GetLastError()) != ERROR_IO_PENDING) {
         int code;
 

trunk/src/VBox/NetworkServices/NAT/pxtcp.c

@@ -2146 +2146 @@
             }
 
-            Assert(toeob == (u16)toeob);
+            Assert(toeob == (u16_t)toeob);
             error = tcp_write(pcb, &pxtcp->inbuf.buf[beg], (u16_t)toeob, maybemore);
             if (error != ERR_OK) {