[GNUnet-SVN] r20126 - in gnunet/src: dns vpn

[gnunet]

Author: grothoff
Date: 2012-02-28 19:53:39 +0100 (Tue, 28 Feb 2012)
New Revision: 20126

Modified:
   gnunet/src/dns/gnunet-service-dns.c
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
-make gcc happy

Modified: gnunet/src/dns/gnunet-service-dns.c
===================================================================
--- gnunet/src/dns/gnunet-service-dns.c 2012-02-28 18:00:07 UTC (rev 20125)
+++ gnunet/src/dns/gnunet-service-dns.c 2012-02-28 18:53:39 UTC (rev 20126)
@@ -1268,6 +1268,7 @@
   {
   case ETH_P_IPV4:
     ip4 = (const struct GNUNET_TUN_IPv4Header *) &tun[1];
+    ip6 = NULL; /* make compiler happy */
     if ( (msize < sizeof (struct GNUNET_TUN_IPv4Header)) ||
         (ip4->version != 4) ||
         (ip4->header_length != sizeof (struct GNUNET_TUN_IPv4Header) / 4) ||
@@ -1283,6 +1284,7 @@
     msize -= sizeof (struct GNUNET_TUN_IPv4Header);
     break;
   case ETH_P_IPV6:
+    ip4 = NULL; /* make compiler happy */
     ip6 = (const struct GNUNET_TUN_IPv6Header *) &tun[1];
     if ( (msize < sizeof (struct GNUNET_TUN_IPv6Header)) ||
         (ip6->version != 6) ||

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2012-02-28 18:00:07 UTC (rev 20125)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2012-02-28 18:53:39 UTC (rev 20126)
@@ -894,6 +894,8 @@
        GNUNET_break (0);
        return;
       }
+      tcp = NULL; /* make compiler happy */
+      icmp = NULL;  /* make compiler happy */
       udp = payload;
       if (udp->len < sizeof (struct GNUNET_TUN_UdpHeader))
       {
@@ -919,6 +921,8 @@
        GNUNET_break (0);
        return;
       }      
+      udp = NULL; /* make compiler happy */
+      icmp = NULL;  /* make compiler happy */
       tcp = payload;
       if (tcp->off * 4 < sizeof (struct GNUNET_TUN_TcpHeader))
       {
@@ -950,6 +954,8 @@
        GNUNET_break (0);
        return;
       }
+      tcp = NULL; /* make compiler happy */
+      udp = NULL;  /* make compiler happy */
       icmp = payload;
       source_port = 0;
       destination_port = 0;