more ldns_ prefix stuff

diff --git a/ldns/buffer.h b/ldns/buffer.h
index 65f0b35d558a23e87b0bb559a3238f27659f5a21..af3446d39d84a1899d304438de7cfa029dfed7c8 100644 (file)
--- a/ldns/buffer.h
+++ b/ldns/buffer.h
@@ -340,7 +340,7 @@ INLINE void
 ldns_buffer_write_u16_at(ldns_buffer *buffer, size_t at, uint16_t data)
 {
        assert(ldns_buffer_available_at(buffer, at, sizeof(data)));
-       write_uint16(buffer->_data + at, data);
+       ldns_write_uint16(buffer->_data + at, data);
 }
 
 /**
@@ -360,7 +360,7 @@ INLINE void
 ldns_buffer_write_u32_at(ldns_buffer *buffer, size_t at, uint32_t data)
 {
        assert(ldns_buffer_available_at(buffer, at, sizeof(data)));
-       write_uint32(buffer->_data + at, data);
+       ldns_write_uint32(buffer->_data + at, data);
 }
 
 /**
@@ -421,7 +421,7 @@ INLINE uint16_t
 ldns_buffer_read_u16_at(ldns_buffer *buffer, size_t at)
 {
        assert(ldns_buffer_available_at(buffer, at, sizeof(uint16_t)));
-       return read_uint16(buffer->_data + at);
+       return ldns_read_uint16(buffer->_data + at);
 }
 
 /**
@@ -442,7 +442,7 @@ INLINE uint32_t
 ldns_buffer_read_u32_at(ldns_buffer *buffer, size_t at)
 {
        assert(ldns_buffer_available_at(buffer, at, sizeof(uint32_t)));
-       return read_uint32(buffer->_data + at);
+       return ldns_read_uint32(buffer->_data + at);
 }
 
 /**

diff --git a/rdata.c b/rdata.c
index 31c74143135a359c719df07d102aafe44dfa8780..d083e45581351c150ac5743fb6b184d1fffb4b27 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -159,7 +159,7 @@ ldns_rdf *
 ldns_native2rdf_int16(ldns_rdf_type type, uint16_t value)
 {
        uint16_t *rdf_data = LDNS_XMALLOC(uint16_t, 1);
-       write_uint16(rdf_data, value);
+       ldns_write_uint16(rdf_data, value);
        return ldns_rdf_new(type, 2, rdf_data);
 }
 
@@ -167,7 +167,7 @@ ldns_rdf *
 ldns_native2rdf_int32(ldns_rdf_type type, uint32_t value)
 {
        uint32_t *rdf_data = LDNS_XMALLOC(uint32_t, 1);
-       write_uint32(rdf_data, value);
+       ldns_write_uint32(rdf_data, value);
        return ldns_rdf_new(type, 4, rdf_data);
 }
 
@@ -175,7 +175,7 @@ ldns_rdf *
 ldns_native2rdf_int16_data(uint16_t size, uint8_t *data)
 {
        uint8_t *rdf_data = LDNS_XMALLOC(uint8_t, (size_t) size + 2);
-       write_uint16(rdf_data, size);
+       ldns_write_uint16(rdf_data, size);
        memcpy(rdf_data + 2, data, size);
        return ldns_rdf_new(LDNS_RDF_TYPE_INT16_DATA, size + 2, rdf_data);
 }

diff --git a/wire2host.c b/wire2host.c
index 8b38878305ec50ed0cd6c02272ff2803627c2327..a096be0e5c7f375483918d8f9d8d660ff9a7f597 100644 (file)
--- a/wire2host.c
+++ b/wire2host.c
@@ -82,7 +82,7 @@ ldns_wire2dname(ldns_rdf **dname, const uint8_t *wire, size_t max, size_t *pos)
                        /* remove first two bits */
                        pointer_target_buf[0] = wire[*pos] & 63;
                        pointer_target_buf[1] = wire[*pos + 1];
-                       pointer_target = read_uint16(pointer_target_buf);
+                       pointer_target = ldns_read_uint16(pointer_target_buf);
 
                        if (pointer_target == 0) {
                                return LDNS_STATUS_INVALID_POINTER;
@@ -161,7 +161,7 @@ ldns_wire2rdf(ldns_rr *rr, const uint8_t *wire,
                return LDNS_STATUS_PACKET_OVERFLOW;
        }
 
-       rd_length = read_uint16(&wire[*pos]);
+       rd_length = ldns_read_uint16(&wire[*pos]);
        *pos = *pos + 2;
 
        if (*pos + rd_length > max) {
@@ -224,7 +224,7 @@ ldns_wire2rdf(ldns_rr *rr, const uint8_t *wire,
                        cur_rdf_length = 4;
                        break;
                case LDNS_RDF_TYPE_INT16_DATA:
-                       cur_rdf_length = (size_t) read_uint16(&wire[*pos])+2;
+                       cur_rdf_length = (size_t) ldns_read_uint16(&wire[*pos])+2;
                        break;
                case LDNS_RDF_TYPE_APL:
                case LDNS_RDF_TYPE_B64:
@@ -281,15 +281,15 @@ ldns_wire2rr(ldns_rr **rr_p, const uint8_t *wire, size_t max,
 
        ldns_rr_set_owner(rr, owner);
        
-       ldns_rr_set_type(rr, read_uint16(&wire[*pos]));
+       ldns_rr_set_type(rr, ldns_read_uint16(&wire[*pos]));
        *pos = *pos + 2;
 
-       ldns_rr_set_class(rr, read_uint16(&wire[*pos]));
+       ldns_rr_set_class(rr, ldns_read_uint16(&wire[*pos]));
        *pos = *pos + 2;
 
        if (section != LDNS_SECTION_QUESTION &&
            ldns_rr_get_type(rr) != LDNS_RR_TYPE_OPT) {
-               ldns_rr_set_ttl(rr, read_uint32(&wire[*pos]));  
+               ldns_rr_set_ttl(rr, ldns_read_uint32(&wire[*pos]));     
                *pos = *pos + 4;
                status = ldns_wire2rdf(rr, wire, max, pos);
                LDNS_STATUS_CHECK_GOTO(status, status_error);
@@ -379,10 +379,10 @@ ldns_wire2pkt(ldns_pkt **packet_p, const uint8_t *wire, size_t max)
                                      LDNS_SECTION_ADDITIONAL);
                if (ldns_rr_get_type(rr) == LDNS_RR_TYPE_OPT) {
                        ldns_pkt_set_edns_udp_size(packet, ldns_rr_get_class(rr));
-                       write_uint32(data, ldns_rr_ttl(rr));
+                       ldns_write_uint32(data, ldns_rr_ttl(rr));
                        ldns_pkt_set_edns_extended_rcode(packet, data[0]);
                        ldns_pkt_set_edns_version(packet, data[1]);
-                       ldns_pkt_set_edns_z(packet, read_uint16(&data[2]));
+                       ldns_pkt_set_edns_z(packet, ldns_read_uint16(&data[2]));
                        ldns_pkt_set_edns_data(packet, ldns_rr_rdf(rr, 0));
                        ldns_rr_free(rr);
                        ldns_pkt_set_arcount(packet, ldns_pkt_arcount(packet) - 1);