- xfr-tsig, const for dname compare and fix warnings in compile.

diff --git a/util/data/dname.c b/util/data/dname.c
index d29a8e0345b14e2d391b553ad7791489b16f0469..750f16cfff9429adcf4774ea31fb8e2d4cca9925 100644 (file)
--- a/util/data/dname.c
+++ b/util/data/dname.c
@@ -97,7 +97,7 @@ dname_valid(uint8_t* dname, size_t maxlen)
 
 /** compare uncompressed, noncanonical, registers are hints for speed */
 int 
-query_dname_compare(register uint8_t* d1, register uint8_t* d2)
+query_dname_compare(const register uint8_t* d1, const register uint8_t* d2)
 {
        register uint8_t lab1, lab2;
        log_assert(d1 && d2);

diff --git a/util/data/dname.h b/util/data/dname.h
index f68c64a03f0d8994dbc1ee6218422f4b4a01fbbf..9bb4ba363fddc8a25093a707cff6eda9ce9d24cf 100644 (file)
--- a/util/data/dname.h
+++ b/util/data/dname.h
@@ -96,7 +96,7 @@ void pkt_dname_tolower(struct sldns_buffer* pkt, uint8_t* dname);
  * @return: -1, 0, or +1 depending on comparison results.
  *     Sort order is first difference found. not the canonical ordering.
  */
-int query_dname_compare(uint8_t* d1, uint8_t* d2);
+int query_dname_compare(const uint8_t* d1, const uint8_t* d2);
 
 /**
  * Determine correct, compressed, dname present in packet.

diff --git a/util/tsig.c b/util/tsig.c
index f8a40fdee94884c43de633062059e7242b5128a4..a1253eda1f329a72f08210f1bda789fa5a6966b5 100644 (file)
--- a/util/tsig.c
+++ b/util/tsig.c
@@ -61,7 +61,6 @@ tsig_verify(sldns_buffer* pkt, const uint8_t* name, const uint8_t* alg,
 {
        size_t   n_rrs;
        size_t   end_of_message;
-       uint16_t rdlength;
        uint8_t  mac[1024];
        uint16_t mac_sz;
        uint8_t  hmac_result[1024];