fix comments - 1

diff --git a/Makefile.in b/Makefile.in
index 81b188bde1fb0bec09209c7b817a1ad314a4f7a7..9fbb8f8e043b7829f5c79a0c5300778ff5619e8a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,7 +330,7 @@ TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \
        lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \
        petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \
        $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \
-       testbound$(EXEEXT) unittest$(EXEEXT)
+       testbound$(EXEEXT) unittest$(EXEEXT) readzone$(EXEEXT)
 tests: all $(TEST_BIN)
 
 check: test

diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index 642134ecc4fb96e1a5926df58ab04c32e1e33e94..983074e1e5f57c6b78f63c0fc68bfe4ecfbc77be 100644 (file)
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -1176,7 +1176,6 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
        int count;
        char ip_str[INET_ADDRSTRLEN+1];
        char *next_ip_str;
-       uint32_t *ip_wire_dst = NULL;
        size_t i;
 
        for (i = 0, count = 1; val[i]; i++) {
@@ -1218,7 +1217,6 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
 
                        val = next_ip_str + 1;
                }
-               ip_wire_dst++;
                count--;
        }
        if (count) /* verify that we parsed all values */
@@ -1233,7 +1231,6 @@ sldns_str2wire_svcbparam_ipv6hint(const char* val, uint8_t* rd, size_t* rd_len)
        int count;
        char ip_str[INET6_ADDRSTRLEN+1];
        char *next_ip_str;
-       uint32_t *ip_wire_dst = NULL;
        size_t i;
 
        for (i = 0, count = 1; val[i]; i++) {
@@ -1269,14 +1266,12 @@ sldns_str2wire_svcbparam_ipv6hint(const char* val, uint8_t* rd, size_t* rd_len)
                        memcpy(ip_str, val, next_ip_str - val);
                        ip_str[next_ip_str - val] = 0;
                        if (inet_pton(AF_INET6, ip_str, rd + *rd_len) != 1) {
-                               val = ip_str; /* to use in error reporting below */
                                break;
                        }
                        *rd_len += LDNS_IP6ADDRLEN;
 
                        val = next_ip_str + 1;
                }
-               ip_wire_dst++;
                count--;
        }
        if (count) /* verify that we parsed all values */
@@ -1297,7 +1292,6 @@ sldns_str2wire_svcbparam_mandatory(const char* val, uint8_t* rd, size_t* rd_len)
 {
        size_t i, count, val_len;
        char* next_key;
-       uint16_t* key_dst = NULL;
 
        val_len = strlen(val);
 
@@ -1342,7 +1336,6 @@ sldns_str2wire_svcbparam_mandatory(const char* val, uint8_t* rd, size_t* rd_len)
 
                val_len -= next_key - val + 1;
                val = next_key + 1; /* skip the comma */
-               key_dst += 1;
        }
 
        /* In draft-ietf-dnsop-svcb-https-06 Section 7:
@@ -1470,8 +1463,6 @@ sldns_str2wire_svcbparam_alpn_value(const char* val,
                return LDNS_WIREPARSE_ERR_SVCB_ALPN_KEY_TOO_LARGE;
        }
        while (val_len) {
-               size_t dst_len;
-
                str_len = (next_str = sldns_str2wire_svcbparam_parse_next_unescaped_comma(val))
                        ? (size_t)(next_str - val) : val_len;
 

diff --git a/sldns/wire2str.c b/sldns/wire2str.c
index 0437477d906eeb1fd688a5ce1ae921a2b986a6bd..83f0abcebefa0271256ec4c9a243abae77fae6ae 100644 (file)
--- a/sldns/wire2str.c
+++ b/sldns/wire2str.c
@@ -989,7 +989,7 @@ static int sldns_wire2str_svcparam_port2str(char** s,
        if (data_len != 2)
                return -1; /* wireformat error, a short is 2 bytes */
        w = sldns_str_print(s, slen, "=%d", (int)sldns_read_uint16(data));
-       *data     += 2;
+       data += 2;
 
        return w;
 }