diff options
author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2013-12-12 10:28:16 +0100 |
---|---|---|
committer | Lorenzo Colitti <lorenzo@google.com> | 2014-03-10 17:43:55 +0900 |
commit | 72f3126f6499cd9017b367f5c7e61cab1d99d080 (patch) | |
tree | 84ab5de17aeb19423b3bea869a98b317f438b160 | |
parent | 82ab730688b8aa5290bdb3d4287e51d3c04f5c95 (diff) | |
download | android_external_android-clat-72f3126f6499cd9017b367f5c7e61cab1d99d080.tar.gz android_external_android-clat-72f3126f6499cd9017b367f5c7e61cab1d99d080.tar.bz2 android_external_android-clat-72f3126f6499cd9017b367f5c7e61cab1d99d080.zip |
DO NOT MERGE: Remove unused variables
Remove unused variables -- they cause warnings (and errors with
-Werror) when building with clang 3.4.
Change-Id: I6ef10841bc1384bf256d73874ae1e709caa6b132
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | clatd.c | 2 | ||||
-rw-r--r-- | config.c | 2 | ||||
-rw-r--r-- | icmp.c | 2 | ||||
-rw-r--r-- | ipv6.c | 1 | ||||
-rw-r--r-- | translate.c | 1 |
5 files changed, 2 insertions, 6 deletions
@@ -144,7 +144,6 @@ void deconfigure_tun_ipv6(const struct tun_data *tunnel) { * tunnel - tun device data */ void configure_tun_ipv6(const struct tun_data *tunnel) { - struct in6_addr local_nat64_prefix_6; int status; status = if_route(tunnel->device6, AF_INET6, &Global_Clatd_Config.ipv6_local_subnet, @@ -377,7 +376,6 @@ void read_packet(int active_fd, const struct tun_data *tunnel) { logmsg(ANDROID_LOG_WARN,"read_packet/tun interface removed"); running = 0; } else { - struct tun_pi tun_header; ssize_t header_size = sizeof(struct tun_pi); if(readlen < header_size) { @@ -154,7 +154,7 @@ void free_config() { * does dns lookups to set the plat subnet or exits on failure, waits forever for a dns response with a query backoff timer */ void dns64_detection() { - int i, backoff_sleep, status; + int backoff_sleep, status; struct in6_addr tmp_ptr; backoff_sleep = 1; @@ -139,7 +139,7 @@ uint8_t icmp6_to_icmp_type(uint8_t type, uint8_t code) { } // We don't understand this ICMP type. Return parameter problem so the caller will bail out. - logmsg_dbg(ANDROID_LOG_DEBUG, "icmp6_to_icmp_type: unhandled ICMP type %d", type); + logmsg_dbg(ANDROID_LOG_DEBUG, "icmp6_to_icmp_type: unhandled ICMP type/code %d/%d", type, code); return ICMP_PARAMETERPROB; } @@ -89,7 +89,6 @@ int ipv6_packet(clat_packet out, int pos, const char *packet, size_t len) { size_t len_left; uint32_t checksum; int iov_len; - int i; if(len < sizeof(struct ip6_hdr)) { logmsg_dbg(ANDROID_LOG_ERROR, "ipv6_packet/too short for an ip6 header: %d", len); diff --git a/translate.c b/translate.c index fc70f3d..71263fa 100644 --- a/translate.c +++ b/translate.c @@ -245,7 +245,6 @@ int icmp6_to_icmp(clat_packet out, int pos, const struct icmp6_hdr *icmp6, uint3 const char *payload, size_t payload_size) { struct icmphdr *icmp_targ = out[pos].iov_base; uint8_t icmp_type; - int ttl; int clat_packet_len; memset(icmp_targ, 0, sizeof(struct icmphdr)); |