dns_hosts_file: move to a separate subsystem

[sfrench/samba-autobuild/.git] / lib / addns / dnsmarshall.c

diff --git a/lib/addns/dnsmarshall.c b/lib/addns/dnsmarshall.c
index 5530290c57a5126c06d1ee456d78e846336de217..59d6470f3458f1695cacf11df83814a7d45a407f 100644 (file)
--- a/lib/addns/dnsmarshall.c
+++ b/lib/addns/dnsmarshall.c
@@ -39,7 +39,7 @@ struct dns_buffer *dns_create_buffer(TALLOC_CTX *mem_ctx)
         */
        result->size = 2;
 
-       if (!(result->data = TALLOC_ARRAY(result, uint8, result->size))) {
+       if (!(result->data = talloc_array(result, uint8, result->size))) {
                TALLOC_FREE(result);
                return NULL;
        }
@@ -78,7 +78,7 @@ void dns_marshall_buffer(struct dns_buffer *buf, const uint8 *data,
 
                new_size += (64 - (new_size % 64));
 
-               if (!(new_data = TALLOC_REALLOC_ARRAY(buf, buf->data, uint8,
+               if (!(new_data = talloc_realloc(buf, buf->data, uint8,
                                                      new_size))) {
                        buf->error = ERROR_DNS_NO_MEMORY;
                        return;
@@ -223,7 +223,7 @@ static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
 
        label->len = len;
 
-       if (!(label->label = TALLOC_ARRAY(label, char, len+1))) {
+       if (!(label->label = talloc_array(label, char, len+1))) {
                buf->error = ERROR_DNS_NO_MEMORY;
                goto error;
        }
@@ -329,7 +329,7 @@ static void dns_unmarshall_rr(TALLOC_CTX *mem_ctx,
        if (!(ERR_DNS_IS_OK(buf->error))) return;
 
        if (r->data_length != 0) {
-               if (!(r->data = TALLOC_ARRAY(r, uint8, r->data_length))) {
+               if (!(r->data = talloc_array(r, uint8, r->data_length))) {
                        buf->error = ERROR_DNS_NO_MEMORY;
                        return;
                }
@@ -390,7 +390,7 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
        uint16 i;
        DNS_ERROR err;
 
-       if (!(req = TALLOC_ZERO_P(mem_ctx, struct dns_request))) {
+       if (!(req = talloc_zero(mem_ctx, struct dns_request))) {
                return ERROR_DNS_NO_MEMORY;
        }
 
@@ -406,22 +406,22 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
        err = ERROR_DNS_NO_MEMORY;
 
        if ((req->num_questions != 0) &&
-           !(req->questions = TALLOC_ARRAY(req, struct dns_question *,
+           !(req->questions = talloc_array(req, struct dns_question *,
                                            req->num_questions))) {
                goto error;
        }
        if ((req->num_answers != 0) &&
-           !(req->answers = TALLOC_ARRAY(req, struct dns_rrec *,
+           !(req->answers = talloc_array(req, struct dns_rrec *,
                                          req->num_answers))) {
                goto error;
        }
        if ((req->num_auths != 0) &&
-           !(req->auths = TALLOC_ARRAY(req, struct dns_rrec *,
+           !(req->auths = talloc_array(req, struct dns_rrec *,
                                        req->num_auths))) {
                goto error;
        }
        if ((req->num_additionals != 0) &&
-           !(req->additionals = TALLOC_ARRAY(req, struct dns_rrec *,
+           !(req->additionals = talloc_array(req, struct dns_rrec *,
                                              req->num_additionals))) {
                goto error;
        }