util: use SCOPE_DELIMITER for the IPv6 scope delimiter

Signed-off-by: Bjoern Jacke <bj@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Dec  9 20:45:15 CET 2016 on sn-devel-144

diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index cb238adcf5d89dbe29e65b3d9418663301f6659e..cbc836cc54c37aa0a22bd98f2321c5571a2a8668 100644 (file)
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -86,7 +86,7 @@ static char *normalize_ipv6_literal(const char *str, char *buf, size_t *_len)
                        cnt_delimiter += 1;
                        break;
                case 's':
-                       buf[i] = '%';
+                       buf[i] = SCOPE_DELIMITER;
                        idx_chars += 1;
                        break;
                case '0':
@@ -131,7 +131,7 @@ static char *normalize_ipv6_literal(const char *str, char *buf, size_t *_len)
 
        for (; idx_chars != 0 && i < len; i++) {
                switch (str[i]) {
-               case '%':
+               case SCOPE_DELIMITER:
                case ':':
                        return NULL;
                default:
@@ -185,7 +185,7 @@ bool interpret_string_addr_internal(struct addrinfo **ppres,
        }
 
        if (strchr_m(str, ':')) {
-               char *p = strchr_m(str, '%');
+               char *p = strchr_m(str, SCOPE_DELIMITER);
 
                /*
                 * Cope with link-local.
@@ -502,7 +502,7 @@ bool is_ipaddress_v6(const char *str)
                unsigned int idx = 0;
                struct in6_addr ip6;
 
-               p = strchr_m(str, '%');
+               p = strchr_m(str, SCOPE_DELIMITER);
                if (p && (p > str)) {
                        len = PTR_DIFF(p, str);
                        idxs = p + 1;