denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some warnings triggered by gcc 4.6 -Wunused-but-set-variable

Browse Source
This commit is contained in:
Martin Willi
2011-05-19 15:47:40 +02:00
parent d30df6ff3d
commit 513701f41b
12 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
+3 -6
View File
@@ -814,7 +814,7 @@ static status_t process_peer_failure(private_eap_mschapv2_t *this,
eap_mschapv2_header_t *eap;
chunk_t data;
char *message, *token, *msg = NULL;
int message_len, error = 0, retriable;
int message_len, error = 0;
chunk_t challenge = chunk_empty;
data = in->get_data(in);
@@ -842,8 +842,7 @@ static status_t process_peer_failure(private_eap_mschapv2_t *this,
}
else if (strneq(token, "R=", 2))
{
token += 2;
retriable = atoi(token);
/* ignore retriable */
}
else if (strneq(token, "C=", 2))
{
@@ -860,9 +859,7 @@ static status_t process_peer_failure(private_eap_mschapv2_t *this,
}
else if (strneq(token, "V=", 2))
{
int version;
token += 2;
version = atoi(token);
/* ignore version */
}
else if (strneq(token, "M=", 2))
{
src/libcharon/plugins/nm/nm_service.c
+1 -2
View File
@@ -82,12 +82,11 @@ static void signal_ipv4_config(NMVPNPlugin *plugin,
{
GValue *val;
GHashTable *config;
host_t *me, *other;
host_t *me;
nm_handler_t *handler;
config = g_hash_table_new(g_str_hash, g_str_equal);
me = ike_sa->get_my_host(ike_sa);
other = ike_sa->get_other_host(ike_sa);
handler = NM_STRONGSWAN_PLUGIN_GET_PRIVATE(plugin)->handler;
/* NM requires a tundev, but netkey does not use one. Passing an invalid
src/libcharon/plugins/socket_raw/socket_raw_socket.c
+1 -6
View File
@@ -435,7 +435,6 @@ static int open_send_socket(private_socket_raw_socket_t *this,
int on = TRUE;
int type = UDP_ENCAP_ESPINUDP;
struct sockaddr_storage addr;
u_int sol;
int skt;
memset(&addr, 0, sizeof(addr));
@@ -448,7 +447,6 @@ static int open_send_socket(private_socket_raw_socket_t *this,
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = INADDR_ANY;
sin->sin_port = htons(port);
sol = SOL_IP;
break;
}
case AF_INET6:
@@ -457,7 +455,6 @@ static int open_send_socket(private_socket_raw_socket_t *this,
sin6->sin6_family = AF_INET6;
memcpy(&sin6->sin6_addr, &in6addr_any, sizeof(in6addr_any));
sin6->sin6_port = htons(port);
sol = SOL_IPV6;
break;
}
default:
@@ -514,18 +511,16 @@ static int open_recv_socket(private_socket_raw_socket_t *this, int family)
{
int skt;
int on = TRUE;
u_int proto_offset, ip_len, sol, udp_header, ike_header;
u_int ip_len, sol, udp_header, ike_header;
/* precalculate constants depending on address family */
switch (family)
{
case AF_INET:
proto_offset = IP_PROTO_OFFSET;
ip_len = IP_LEN;
sol = SOL_IP;
break;
case AF_INET6:
proto_offset = IP6_PROTO_OFFSET;
ip_len = 0; /* IPv6 raw sockets contain no IP header */
sol = SOL_IPV6;
break;