projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warnings.
[tinc]
/
src
/
subnet_parse.c
diff --git
a/src/subnet_parse.c
b/src/subnet_parse.c
index
5922831
..
5b0b482
100644
(file)
--- 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;
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--;
if (*cur != ':') {
zero_group_count--;
- for (; *cur && *cur != ':'; cur++);
+ while(cur[1] && cur[1] != ':')
+ cur++;
}
if (zero_group_count < 1)
return false;
}
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[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;
netstr += result;
len -= result;
break;