Changeset 15845 in vbox

Timestamp:

Jan 7, 2009 7:51:29 PM (16 years ago)

Author:

vboxsync

Message:

warnings and minor fixes to coding style

Location:

trunk/src/VBox

Files:

• Devices/Network/slirp/bootp.c (modified) (1 diff)
• Devices/Network/slirp/ip_input.c (modified) (1 diff)
• Devices/Network/slirp/tcp_input.c (modified) (1 diff)
• Devices/Network/slirp/tcp_timer.c (modified) (1 diff)
• Devices/Network/slirp/tftp.c (modified) (1 diff)
• Devices/Network/slirp/udp.c (modified) (1 diff)
• Devices/Storage/DevATA.cpp (modified) (2 diffs)
• VMM/SSM.cpp (modified) (1 diff)

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

@@ -319 +319 @@
     struct bootp_t *bp = mtod(m, struct bootp_t *);
 
-    if (bp->bp_op == BOOTP_REQUEST) {
+    if (bp->bp_op == BOOTP_REQUEST)
         bootp_reply(pData, bp);
-    }
-}
+}

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

@@ -526 +526 @@
             fpp = fp;
             fp = TAILQ_NEXT(fp, ipq_list);
-            if(--fpp->ipq_ttl == 0) {
+            if(--fpp->ipq_ttl == 0)
+            {
                 ipstat.ips_fragtimeout += fpp->ipq_nfrags;
                 ip_freef(pData, &ipq[i], fpp);

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

@@ -515 +515 @@
 #if 0
         if (ts_present && SEQ_LEQ(ti->ti_seq, tp->last_ack_sent) &&
-                SEQ_LT(tp->last_ack_sent, ti->ti_seq + ti->ti_len)) {
+                SEQ_LT(tp->last_ack_sent, ti->ti_seq + ti->ti_len))
+        {
             tp->ts_recent_age = tcp_now;
             tp->ts_recent = ts_val;

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

@@ -279 +279 @@
                 goto dropit;
 /*          if (tp->t_socket->so_options & SO_KEEPALIVE && */
-            if ((so_options) && tp->t_state <= TCPS_CLOSE_WAIT) {
+            if ((so_options) && tp->t_state <= TCPS_CLOSE_WAIT)
+            {
                 if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
                     goto dropit;

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

@@ -305 +305 @@
     if (   !strncmp((const char*)spt->filename, "../", 3)
         || (spt->filename[strlen((const char *)spt->filename) - 1] == '/')
-        ||  strstr((const char *)spt->filename, "/../")) {
+        ||  strstr((const char *)spt->filename, "/../"))
+    {
         tftp_send_error(pData, spt, 2, "Access violation", tp);
         return;

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

@@ -238 +238 @@
 
     ttl = ip->ip_ttl = save_ip.ip_ttl;
-    ret = setsockopt(so->s, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
-    if (ret < 0) {
-        LogRel(("NAT: Error (%s) occurred while setting TTL(%d) attribute of IP packet to socket %R[natsock]\n", strerror(errno), ip->ip_ttl, so));
-    }
+    ret = setsockopt(so->s, IPPROTO_IP, IP_TTL, (const char*)&ttl, sizeof(ttl));
+    if (ret < 0)
+        LogRel(("NAT: Error (%s) occurred while setting TTL(%d) attribute "
+                "of IP packet to socket %R[natsock]\n", strerror(errno), ip->ip_ttl, so));
 
     if (sosendto(pData, so, m) == -1)

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -1095 +1095 @@
 {
     uint16_t *p;
-    char aSerial[20];
-    int rc;
-    RTUUID Uuid;
 
     Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);
@@ -1208 +1205 @@
 {
     uint16_t *p;
-    char aSerial[20];
-    RTUUID Uuid;
-    int rc;
 
     Assert(s->uTxDir == PDMBLOCKTXDIR_FROM_DEVICE);

trunk/src/VBox/VMM/SSM.cpp

@@ -338 +338 @@
 static DECLCALLBACK(int) ssmR3SelfSaveExec(PVM pVM, PSSMHANDLE pSSM)
 {
-    char szTmp[128];
-
     /*
      * String table containg pairs of variable and value string.