j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fix compiler warnings.

Browse source
This commit is contained in:
Guus Sliepen 2014-07-08 14:20:01 +02:00
parent 163773d710
commit 23a22ea1ce
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/net_setup.c
View file

@ -445,7 +445,6 @@ bool setup_myself_reloadable(void) {
char *fmode = NULL; char *fmode = NULL;
char *bmode = NULL; char *bmode = NULL;
char *afname = NULL; char *afname = NULL;
char *address = NULL;
char *space; char *space;
bool choice; bool choice;

8
src/subnet_parse.c
View file

@ -262,10 +262,11 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
if (double_colon) { if (double_colon) {
/* Figure out how many zero groups we need to expand */ /* Figure out how many zero groups we need to expand */
int zero_group_count = 8; int zero_group_count = 8;
for (const char* cur = str; *cur; *cur && cur++) for (const char* cur = str; *cur; cur++)
if (*cur != ':') { if (*cur != ':') {
zero_group_count--; zero_group_count--;
for (; *cur && *cur != ':'; cur++); while(cur[1] && cur[1] != ':')
cur++;
} }
if (zero_group_count < 1) if (zero_group_count < 1)
return false; 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[2],
subnet->net.mac.address.x[3], subnet->net.mac.address.x[3],
subnet->net.mac.address.x[4], subnet->net.mac.address.x[4],
subnet->net.mac.address.x[5], subnet->net.mac.address.x[5]);
subnet->weight);
netstr += result; netstr += result;
len -= result; len -= result;
break; break;