From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 28 Feb 2012 18:53:39 +0000 (+0000)
Subject: -make gcc happy
X-Git-Tag: initial-import-from-subversion-38251~14557
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a9c0bd3293015faa8c2e9d552706227ea2cf170;p=oweals%2Fgnunet.git

-make gcc happy
---

diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 1f48b105a..37d2fbca8 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -1268,6 +1268,7 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client,
   {
   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 @@ process_helper_messages (void *cls GNUNET_UNUSED, void *client,
     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) ||
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 26deeee25..5290ad69e 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -894,6 +894,8 @@ route_packet (struct DestinationEntry *destination,
 	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 @@ route_packet (struct DestinationEntry *destination,
 	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 @@ route_packet (struct DestinationEntry *destination,
 	GNUNET_break (0);
 	return;
       }
+      tcp = NULL; /* make compiler happy */
+      udp = NULL;  /* make compiler happy */
       icmp = payload;
       source_port = 0;
       destination_port = 0;