The Hurd and gcc 3.4.x part #2

[Alfred M. Szmidt]

The following errors happen when compiling pfinet (I trimed the output a bit):

../../hurd/pfinet/linux-src/net/ipv4/arp.c:277: error: label at end of compound 
statement
../../hurd/pfinet/linux-src/net/ipv4/route.c:725: error: label at end of 
compound statement
../../hurd/pfinet/linux-src/net/ipv4/tcp_ipv4.c:231: error: label at end of 
compound statement
../../hurd/pfinet/linux-src/net/ipv4/tcp_ipv4.c:595: error: parse error before 
"__FUNCTION__"
../../hurd/pfinet/linux-src/net/ipv4/tcp_ipv4.c:231: error: label at end of 
compound statement
../../hurd/pfinet/linux-src/net/ipv4/tcp_ipv4.c:1732: error: label at end of 
compound statement
../../hurd/pfinet/linux-src/net/ipv4/udp.c:160: error: label at end of compound 
statement

Index: pfinet/ChangeLog
2004-09-03  Alfred M. Szmidt  <ams@kemisten.nu>

        * linux-src/net/ipv4/udp.c (udp_v4_get_port): Made gcc 3.4.x
        shutup due to broken Linux code.
        * linux-src/net/ipv4/tcp_ipv4.c (tcp_v4_get_port)
        (tcp_v4_connect, tcp_v4_rcv): Likewise.
        * linux-src/net/ipv4/route.c (ip_rt_redirect): Likewise.
        * linux-src/net/ipv4/arp.c (arp_constructor): Likewise.

Index: pfinet/linux-src/net/ipv4/arp.c
===================================================================
RCS file: /cvsroot/hurd/hurd/pfinet/linux-src/net/ipv4/arp.c,v
retrieving revision 1.4
diff -u -r1.4 arp.c
--- pfinet/linux-src/net/ipv4/arp.c     5 Feb 2000 12:24:31 -0000       1.4
+++ pfinet/linux-src/net/ipv4/arp.c     3 Sep 2004 14:14:21 -0000
@@ -2,7 +2,7 @@
  *
  * Version:    $Id: arp.c,v 1.77.2.4 1999/09/23 19:03:36 davem Exp $
  *
- * Copyright (C) 1994 by Florian  La Roche
+ * Copyright (C) 1994, 2004 by Florian  La Roche
  *
  * This module implements the Address Resolution Protocol ARP (RFC 826),
  * which is used to convert IP addresses (or in the future maybe other
@@ -274,6 +274,7 @@
                        neigh->output = neigh->ops->output;
                        return 0;
 #endif
+                       break;
                }
 #endif
                if (neigh->type == RTN_MULTICAST) {
Index: pfinet/linux-src/net/ipv4/route.c
===================================================================
RCS file: /cvsroot/hurd/hurd/pfinet/linux-src/net/ipv4/route.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 route.c
--- pfinet/linux-src/net/ipv4/route.c   5 Feb 2000 12:21:16 -0000       1.1.1.3
+++ pfinet/linux-src/net/ipv4/route.c   3 Sep 2004 14:14:23 -0000
@@ -721,6 +721,8 @@
                       "Path = %X -> %X, tos %02x\n",
                       ntohl(old_gw), dev->name, ntohl(new_gw),
                       ntohl(saddr), ntohl(daddr), tos);
+#else
+       ; /* Do nothing.  */
 #endif
 }
 
Index: pfinet/linux-src/net/ipv4/tcp_ipv4.c
===================================================================
RCS file: /cvsroot/hurd/hurd/pfinet/linux-src/net/ipv4/tcp_ipv4.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 tcp_ipv4.c
--- pfinet/linux-src/net/ipv4/tcp_ipv4.c        5 Feb 2000 12:21:16 -0000       
1.1.1.3
+++ pfinet/linux-src/net/ipv4/tcp_ipv4.c        3 Sep 2004 14:14:24 -0000
@@ -228,6 +228,7 @@
                                        goto next;
                        break;
                next:
+                       ; /* Do nothing.  */
                } while (--remaining > 0);
                tcp_port_rover = rover;
 
@@ -592,7 +593,7 @@
                if (usin->sin_family)
                        return(-EAFNOSUPPORT);
                if (!complained++)
-                       printk(KERN_DEBUG "%s forgot to set AF_INET in " 
__FUNCTION__ "\n", current->comm);
+                       printk(KERN_DEBUG "%s forgot to set AF_INET in %s\n", 
current->comm, __FUNCTION__);
        }
 
        nexthop = daddr = usin->sin_addr.s_addr;
@@ -1728,7 +1729,7 @@
                        goto discard_it;
                }
        default:
-               /* CHECKSUM_UNNECESSARY */
+               ; /* CHECKSUM_UNNECESSARY */
        }
 
        if((th->doff * 4) < sizeof(struct tcphdr) ||
Index: pfinet/linux-src/net/ipv4/udp.c
===================================================================
RCS file: /cvsroot/hurd/hurd/pfinet/linux-src/net/ipv4/udp.c,v
retrieving revision 1.2
diff -u -r1.2 udp.c
--- pfinet/linux-src/net/ipv4/udp.c     4 Feb 2000 06:32:39 -0000       1.2
+++ pfinet/linux-src/net/ipv4/udp.c     3 Sep 2004 14:14:25 -0000
@@ -157,6 +157,7 @@
                        best_size_so_far = size;
                        best = result;
                next:
+                       ; /* Do nothing.  */
                }
                result = best;
                for(;; result += UDP_HTABLE_SIZE) {