projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop h and hh length modifiers from printf format strings.
[tinc]
/
src
/
subnet_parse.c
diff --git
a/src/subnet_parse.c
b/src/subnet_parse.c
index
c919b59
..
c5f6976
100644
(file)
--- a/
src/subnet_parse.c
+++ b/
src/subnet_parse.c
@@
-372,7
+372,7
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
result = snprintf(netstr, len, *format, ":::");
i += max_zero_length;
} else {
result = snprintf(netstr, len, *format, ":::");
i += max_zero_length;
} else {
- result = snprintf(netstr, len, "%
h
x:", ntohs(subnet->net.ipv6.address.x[i]));
+ result = snprintf(netstr, len, "%x:", ntohs(subnet->net.ipv6.address.x[i]));
i++;
}
netstr += result;
i++;
}
netstr += result;
@@
-401,11
+401,8
@@
bool net2str(char *netstr, int len, const subnet_t *subnet) {
len -= result;
}
len -= result;
}
- if (subnet->weight != DEFAULT_WEIGHT)
{
+ if (subnet->weight != DEFAULT_WEIGHT)
snprintf(netstr, len, "#%d", subnet->weight);
snprintf(netstr, len, "#%d", subnet->weight);
- netstr += result;
- len -= result;
- }
return true;
}
return true;
}