Changeset 27797 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Mar 29, 2010 4:09:43 PM (15 years ago)

Author:

vboxsync

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

59454

Message:

misc compiler warning fixes, comment typos and other minor cleanups

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (3 diffs)
• mbuf.c (modified) (1 diff)
• socket.c (modified) (1 diff)
• tcp_input.c (modified) (1 diff)
• tcp_output.c (modified) (1 diff)

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

@@ -340 +340 @@
 static int dhcp_send_ack(PNATState pData, struct bootp_t *bp, BOOTPClient *bc, struct mbuf *m, int fDhcpRequest)
 {
-    struct bootp_t *rbp;
     int offReply = 0; /* boot_reply will fill general options and add END before sending response */
 
@@ -384 +383 @@
     struct in_addr daddr;
     int offReply;
-    uint8_t *opt;
     uint8_t *req_ip = NULL;
     uint8_t *server_ip = NULL;
@@ -619 +617 @@
     struct in_addr req_ip;
     int fDhcpDiscover = 0;
-    int len, tag;
     struct mbuf *m = NULL;
 

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

@@ -137 +137 @@
             goto recheck_zone;
         AssertMsgFailed(("No mbufs on free list\n"));
-        return NULL;
+        m = NULL;
+        goto end_error;
 #else
         m = (struct mbuf *)RTMemAlloc(msize);

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

@@ -568 +568 @@
         /* A "normal" UDP packet */
         struct mbuf *m;
-        struct ethhdr *eh;
         ssize_t len;
         u_long n = 0;

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

@@ -431 +431 @@
         || so->so_faddr.s_addr != ti->ti_dst.s_addr)
     {
+#ifdef VBOX_WITH_SLIRP_MT
         struct socket *sonxt;
+#endif
         QSOCKET_UNLOCK(tcb);
         /* @todo fix SOLOOKUP macrodefinition to be usable here */

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

@@ -81 +81 @@
     unsigned optlen, hdrlen;
     int idle, sendalot;
+#ifdef VBOX_WITH_SLIRP_BSD_MBUF
     int size;
+#endif
 
     DEBUG_CALL("tcp_output");