From: Guus Sliepen Date: Tue, 8 Jul 2014 12:20:01 +0000 (+0200) Subject: Fix compiler warnings. X-Git-Tag: release-1.1pre11~76 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=23a22ea1ceb9d0a6b6c288142130f0e30c0fdec9;p=tinc Fix compiler warnings. --- diff --git a/src/net_setup.c b/src/net_setup.c index c4f2127e..96a72247 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -445,7 +445,6 @@ bool setup_myself_reloadable(void) { char *fmode = NULL; char *bmode = NULL; char *afname = NULL; - char *address = NULL; char *space; bool choice; diff --git a/src/subnet_parse.c b/src/subnet_parse.c index 59228311..5b0b4822 100644 --- a/src/subnet_parse.c +++ b/src/subnet_parse.c @@ -262,10 +262,11 @@ bool str2net(subnet_t *subnet, const char *subnetstr) { if (double_colon) { /* Figure out how many zero groups we need to expand */ int zero_group_count = 8; - for (const char* cur = str; *cur; *cur && cur++) + for (const char* cur = str; *cur; cur++) if (*cur != ':') { zero_group_count--; - for (; *cur && *cur != ':'; cur++); + while(cur[1] && cur[1] != ':') + cur++; } if (zero_group_count < 1) return false; @@ -319,8 +320,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) { subnet->net.mac.address.x[2], subnet->net.mac.address.x[3], subnet->net.mac.address.x[4], - subnet->net.mac.address.x[5], - subnet->weight); + subnet->net.mac.address.x[5]); netstr += result; len -= result; break;