儲存庫 vbox 的更動 40423

時間撮記:

2012-3-11 上午03:22:22 (13 年 以前)

作者:

vboxsync

訊息:

NAT: warnings [-Wunused-macros]

位置:

trunk/src/VBox/Devices/Network/slirp

檔案:

• dnsproxy/dnsproxy.c (修改) (1 筆差異)
• ip_icmp.c (修改) (1 筆差異)
• libalias/alias_db.c (修改) (1 筆差異)
• libalias/alias_mod.c (修改) (1 筆差異)
• libalias/alias_proxy.c (修改) (1 筆差異)
• misc.c (修改) (1 筆差異)
• slirp.c (修改) (4 筆差異)
• socket.c (修改) (1 筆差異)
• tcp_input.c (修改) (1 筆差異)
• tcp_subr.c (修改) (1 筆差異)

trunk/src/VBox/Devices/Network/slirp/dnsproxy/dnsproxy.c

@@ -79 +79 @@
 }
 
-#else
+#else /* VBOX */
 
 # define RD(x) (*(x + 2) & 0x01)
-# define MAX_BUFSPACE 512
 
 # define QUERYID queryid++

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -54 +54 @@
  */
 
-#define NEED_SOME_m_getjcl
 #include "slirp.h"
 #include "ip_icmp.h"

trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c

@@ -327 +327 @@
 #define LINK_PERMANENT             0x04
 #define LINK_PARTIALLY_SPECIFIED   0x03 /* logical-or of first two bits */
-#define LINK_UNFIREWALLED          0x08
-
 #ifndef VBOX
+# define LINK_UNFIREWALLED          0x08 /* This macro definition isn't used in this revision of libalias */
+
     int     timestamp;  /* Time link was last accessed         */
     int     expire_time;    /* Expire time for link                */
-#else
+#else /* VBOX */
     unsigned int timestamp;  /* Time link was last accessed         */
     unsigned int expire_time;    /* Expire time for link                */

trunk/src/VBox/Devices/Network/slirp/libalias/alias_mod.c

@@ -113 +113 @@
 }
 
-#else
-#define LIBALIAS_RWLOCK_INIT() ;
-#define LIBALIAS_RWLOCK_DESTROY()   ;
-#define LIBALIAS_WLOCK_ASSERT() ;
-#define LIBALIAS_RLOCK() ;
-#define LIBALIAS_RUNLOCK() ;
-#define LIBALIAS_WLOCK() ;
-#define LIBALIAS_WUNLOCK() ;
-#define _handler_chain_init() ;
-#define _handler_chain_destroy() ;
+#else /* VBOX */
+# define LIBALIAS_WLOCK_ASSERT() ;
+# define LIBALIAS_RLOCK() ;
+# define LIBALIAS_RUNLOCK() ;
+# define LIBALIAS_WLOCK() ;
+# define LIBALIAS_WUNLOCK() ;
+# define _handler_chain_init() ;
+# define _handler_chain_destroy() ;
 #endif
 

trunk/src/VBox/Devices/Network/slirp/libalias/alias_proxy.c

@@ -87 +87 @@
 # include "alias.h"     /* Public API functions for libalias */
 # include "alias_local.h"   /* Functions used by alias*.c */
-# define isspace(ch)    RT_C_IS_SPACE(ch)
 # define tolower(ch)    RT_C_TO_LOWER(ch)
 #endif /* VBOX */

trunk/src/VBox/Devices/Network/slirp/misc.c

@@ -25 +25 @@
  */
 
-#define WANT_SYS_IOCTL_H
 #include <slirp.h>
 #include "zone.h"

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -114 +114 @@
            || !(polls[(so)->so_poll_index].revents & POLLNVAL)))
 
-  /* specific for Unix API */
-# define DO_UNIX_CHECK_FD_SET(so, events, fdset) DO_CHECK_FD_SET((so), (events), fdset)
   /* specific for Windows Winsock API */
 # define DO_WIN_CHECK_FD_SET(so, events, fdset) 0
@@ -129 +127 @@
 # define closefds_poll   (POLLHUP)
 # define rderr_poll      (POLLERR)
-# define rdhup_poll      (POLLHUP)
-# define nval_poll       (POLLNVAL)
+# if 0 /* unused yet */
+#  define rdhup_poll      (POLLHUP)
+#  define nval_poll       (POLLNVAL)
+# endif
 
 # define ICMP_ENGAGE_EVENT(so, fdset)              \
@@ -206 +206 @@
 #ifdef RT_OS_WINDOWS
 # define WIN_TCP_ENGAGE_EVENT2(so, fdset, fdset2) TCP_ENGAGE_EVENT2(so, fdset1, fdset2)
-#else
-# define WIN_TCP_ENGAGE_EVENT2(so, fdset, fdset2) do{}while(0)
 #endif
 
@@ -224 +222 @@
 #define WIN_CHECK_FD_SET(so, events, set) \
     (DO_WIN_CHECK_FD_SET((so), (events), set))
-
-#define UNIX_CHECK_FD_SET(so, events, set) \
-    (DO_UNIX_CHECK_FD_SET(so, events, set))
 
 /*

trunk/src/VBox/Devices/Network/slirp/socket.c

@@ -25 +25 @@
  */
 
-#define WANT_SYS_IOCTL_H
 #include <slirp.h>
 #include "ip_icmp.h"

trunk/src/VBox/Devices/Network/slirp/tcp_input.c

@@ -66 +66 @@
 
 
-#define TCP_PAWS_IDLE   (24 * 24 * 60 * 60 * PR_SLOWHZ)
+#if 0 /* code using this macroses is commented out */
+# define TCP_PAWS_IDLE   (24 * 24 * 60 * 60 * PR_SLOWHZ)
 
 /* for modulo comparisons of timestamps */
-#define TSTMP_LT(a, b)   ((int)((a)-(b)) < 0)
-#define TSTMP_GEQ(a, b)  ((int)((a)-(b)) >= 0)
+# define TSTMP_LT(a, b)   ((int)((a)-(b)) < 0)
+# define TSTMP_GEQ(a, b)  ((int)((a)-(b)) >= 0)
+#endif
 
 #ifndef TCP_ACK_HACK

trunk/src/VBox/Devices/Network/slirp/tcp_subr.c

@@ -62 +62 @@
  */
 
-#define WANT_SYS_IOCTL_H
 #include <slirp.h>