more prefixes

added const to version function

diff --git a/host2str.c b/host2str.c
index bb4496c43a2ab5862ff57f104dbea9671762eb7e..a67c6bdbd8cdfa217f23fe2e74aef92d37c84aa6 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -429,7 +429,7 @@ ldns_rdf2buffer_str_wks(ldns_buffer *output, ldns_rdf *rdf)
        for (current_service = 0; 
             current_service < ldns_rdf_size(rdf) * 8;
             current_service++) {
-               if (get_bit(&(ldns_rdf_data(rdf)[1]), current_service)) {
+               if (ldns_get_bit(&(ldns_rdf_data(rdf)[1]), current_service)) {
                        service = getservbyport((int) ntohs(current_service),
                                                proto_name);
                        if (service && service->s_name) {
@@ -461,7 +461,7 @@ ldns_rdf2buffer_str_nsec(ldns_buffer *output, ldns_rdf *rdf)
                pos += 2;
                
                for (bit_pos = 0; bit_pos < (bitmap_length) * 8; bit_pos++) {
-                       if (get_bit(&data[pos], bit_pos)) {
+                       if (ldns_get_bit(&data[pos], bit_pos)) {
                                type = 256 * (uint16_t) window_block_nr + bit_pos;
                                descriptor = ldns_rr_descript(type);
 

diff --git a/rdata.c b/rdata.c
index d083e45581351c150ac5743fb6b184d1fffb4b27..080ac2246d5d01c82ccc32a72e7d450091a3204d 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -417,7 +417,7 @@ ldns_rdf_address_reverse(ldns_rdf *rdf)
                                /* extract nibble */
                                nibble = (ldns_rdf_data(rdf)[octet] & ( 0xf << (4 * (1 - nnibble)) ) ) >> ( 4 * (1 - nnibble));
                                buf_6[(LDNS_IP6ADDRLEN * 2 - 1) -
-                                       (octet * 2 + nnibble)] = (uint8_t)int_to_hexdigit((int)nibble);
+                                       (octet * 2 + nnibble)] = (uint8_t)ldns_int_to_hexdigit((int)nibble);
                        }
 
                        char_dname = LDNS_XMALLOC(char, (LDNS_IP6ADDRLEN * 4));

diff --git a/str2host.c b/str2host.c
index b45c31dd3b417fdab188f755593c5c38f12d2289..847ca6497bbf7a0462b33018bae210b06aefba7c 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -204,9 +204,9 @@ ldns_str2rdf_dname(ldns_rdf **d, const char *str)
                            isdigit((int) s[2]) &&
                            isdigit((int) s[3])) {
                                /* cast this so it fits */
-                               val = (uint8_t) hexdigit_to_int((char) s[1]) * 100 +
-                                               hexdigit_to_int((char) s[2]) * 10 +
-                                               hexdigit_to_int((char) s[3]);
+                               val = (uint8_t) ldns_hexdigit_to_int((char) s[1]) * 100 +
+                                               ldns_hexdigit_to_int((char) s[2]) * 10 +
+                                               ldns_hexdigit_to_int((char) s[3]);
                                *q = val;
                                s += 3;
                        } else {
@@ -322,7 +322,7 @@ ldns_str2rdf_hex(ldns_rdf **rd, const char *str)
                         *t = 0;
                         for (i = 16; i >= 1; i -= 15) {
                                 if (isxdigit(*str)) {
-                                        *t += hexdigit_to_int(*str) * i;
+                                        *t += ldns_hexdigit_to_int(*str) * i;
                                 } else {
                                         return LDNS_STATUS_ERR;
                                 }

diff --git a/util.c b/util.c
index 6b9862fe11a34936dfa4ec6091a17362ac6ebbbe..32ed2a2148f1c030674131944cffcc6e43c21c6f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -86,22 +86,6 @@ get_bit_r(uint8_t bits[], size_t index)
        return (int) bits[index / 8] & (1 << (index % 8));
 }
 
-inline long
-power(long a, long b) {
-       long result = 1;
-       while (b > 0) {
-               if (b & 1) {
-                       result *= a;
-                       if (b == 1) {
-                               return result;
-                       }
-               }
-               a *= a;
-               b /= 2;
-       }
-       return result;
-}
-
 int
 hexdigit_to_int(char ch)
 {
@@ -152,7 +136,7 @@ int_to_hexdigit(int i)
        }
 }
 
-char *
+const char *
 ldns_version(void)
 {
        return (char*)LDNS_VERSION;