X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=lib%2Faddns%2Fdnsmarshall.c;h=846fd5bf16ae38f53a407bfd7e01b0625f79cbf6;hp=3401b31469df37ffb4261359d762cf6f8bd9e992;hb=eecc1d294256210ee8c2f6ab79d21b835258a6d4;hpb=3d15137653a7d1b593a9af2eef12f6e5b9a04c4f;ds=sidebyside

diff --git a/lib/addns/dnsmarshall.c b/lib/addns/dnsmarshall.c
index 3401b31469d..846fd5bf16a 100644
--- a/lib/addns/dnsmarshall.c
+++ b/lib/addns/dnsmarshall.c
@@ -27,7 +27,7 @@ struct dns_buffer *dns_create_buffer(TALLOC_CTX *mem_ctx)
 {
 	struct dns_buffer *result;
 
-	if (!(result = talloc(mem_ctx, struct dns_buffer))) {
+	if (!(result = talloc_zero(mem_ctx, struct dns_buffer))) {
 		return NULL;
 	}
 
@@ -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_zero_array(result, uint8_t, result->size))) {
 		TALLOC_FREE(result);
 		return NULL;
 	}
@@ -47,7 +47,7 @@ struct dns_buffer *dns_create_buffer(TALLOC_CTX *mem_ctx)
 	return result;
 }
 
-void dns_marshall_buffer(struct dns_buffer *buf, const uint8 *data,
+void dns_marshall_buffer(struct dns_buffer *buf, const uint8_t *data,
 			 size_t len)
 {
 	if (!ERR_DNS_IS_OK(buf->error)) return;
@@ -70,7 +70,7 @@ void dns_marshall_buffer(struct dns_buffer *buf, const uint8 *data,
 		
 	if (buf->offset + len > buf->size) {
 		size_t new_size = buf->offset + len;
-		uint8 *new_data;
+		uint8_t *new_data;
 
 		/*
 		 * Don't do too many reallocs, round up to some multiple
@@ -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(buf, buf->data, uint8,
+		if (!(new_data = talloc_realloc(buf, buf->data, uint8_t,
 						      new_size))) {
 			buf->error = ERROR_DNS_NO_MEMORY;
 			return;
@@ -93,19 +93,19 @@ void dns_marshall_buffer(struct dns_buffer *buf, const uint8 *data,
 	return;
 }
 
-void dns_marshall_uint16(struct dns_buffer *buf, uint16 val)
+void dns_marshall_uint16(struct dns_buffer *buf, uint16_t val)
 {
-	uint16 n_val = htons(val);
-	dns_marshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+	uint16_t n_val = htons(val);
+	dns_marshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
 }
 
-void dns_marshall_uint32(struct dns_buffer *buf, uint32 val)
+void dns_marshall_uint32(struct dns_buffer *buf, uint32_t val)
 {
-	uint32 n_val = htonl(val);
-	dns_marshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+	uint32_t n_val = htonl(val);
+	dns_marshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
 }
 
-void dns_unmarshall_buffer(struct dns_buffer *buf, uint8 *data,
+void dns_unmarshall_buffer(struct dns_buffer *buf, uint8_t *data,
 			   size_t len)
 {
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
@@ -121,21 +121,21 @@ void dns_unmarshall_buffer(struct dns_buffer *buf, uint8 *data,
 	return;
 }
 
-void dns_unmarshall_uint16(struct dns_buffer *buf, uint16 *val)
+void dns_unmarshall_uint16(struct dns_buffer *buf, uint16_t *val)
 {
-	uint16 n_val;
+	uint16_t n_val;
 
-	dns_unmarshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+	dns_unmarshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
 	*val = ntohs(n_val);
 }
 
-void dns_unmarshall_uint32(struct dns_buffer *buf, uint32 *val)
+void dns_unmarshall_uint32(struct dns_buffer *buf, uint32_t *val)
 {
-	uint32 n_val;
+	uint32_t n_val;
 
-	dns_unmarshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+	dns_unmarshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
 	*val = ntohl(n_val);
@@ -152,16 +152,16 @@ void dns_marshall_domain_name(struct dns_buffer *buf,
 	 */
 
 	for (label = name->pLabelList; label != NULL; label = label->next) {
-		uint8 len = label->len;
+		uint8_t len = label->len;
 
-		dns_marshall_buffer(buf, (uint8 *)&len, sizeof(len));
+		dns_marshall_buffer(buf, (uint8_t *)&len, sizeof(len));
 		if (!ERR_DNS_IS_OK(buf->error)) return;
 
-		dns_marshall_buffer(buf, (uint8 *)label->label, len);
+		dns_marshall_buffer(buf, (uint8_t *)label->label, len);
 		if (!ERR_DNS_IS_OK(buf->error)) return;
 	}
 
-	dns_marshall_buffer(buf, (uint8 *)&end_char, 1);
+	dns_marshall_buffer(buf, (uint8_t *)&end_char, 1);
 }
 
 static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
@@ -170,7 +170,7 @@ static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
 				 struct dns_domain_label **plabel)
 {
 	struct dns_domain_label *label;
-	uint8 len;
+	uint8_t len;
 
 	if (!ERR_DNS_IS_OK(buf->error)) return;
 
@@ -196,7 +196,7 @@ static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
 		 * and using the calculated offset.
 		 */
 		struct dns_buffer new_buf;
-		uint8 low;
+		uint8_t low;
 
 		dns_unmarshall_buffer(buf, &low, sizeof(low));
 		if (!ERR_DNS_IS_OK(buf->error)) return;
@@ -216,19 +216,19 @@ static void dns_unmarshall_label(TALLOC_CTX *mem_ctx,
 		return;
 	}
 
-	if (!(label = talloc(mem_ctx, struct dns_domain_label))) {
+	if (!(label = talloc_zero(mem_ctx, struct dns_domain_label))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
 
 	label->len = len;
 
-	if (!(label->label = talloc_array(label, char, len+1))) {
+	if (!(label->label = talloc_zero_array(label, char, len+1))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		goto error;
 	}
 
-	dns_unmarshall_buffer(buf, (uint8 *)label->label, len);
+	dns_unmarshall_buffer(buf, (uint8_t *)label->label, len);
 	if (!ERR_DNS_IS_OK(buf->error)) goto error;
 
 	dns_unmarshall_label(label, level+1, buf, &label->next);
@@ -250,7 +250,7 @@ void dns_unmarshall_domain_name(TALLOC_CTX *mem_ctx,
 
 	if (!ERR_DNS_IS_OK(buf->error)) return;
 
-	if (!(name = talloc(mem_ctx, struct dns_domain_name))) {
+	if (!(name = talloc_zero(mem_ctx, struct dns_domain_name))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -281,7 +281,7 @@ static void dns_unmarshall_question(TALLOC_CTX *mem_ctx,
 
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-	if (!(q = talloc(mem_ctx, struct dns_question))) {
+	if (!(q = talloc_zero(mem_ctx, struct dns_question))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -314,7 +314,7 @@ static void dns_unmarshall_rr(TALLOC_CTX *mem_ctx,
 
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-	if (!(r = talloc(mem_ctx, struct dns_rrec))) {
+	if (!(r = talloc_zero(mem_ctx, struct dns_rrec))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -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_zero_array(r, uint8_t, r->data_length))) {
 			buf->error = ERROR_DNS_NO_MEMORY;
 			return;
 		}
@@ -346,7 +346,7 @@ DNS_ERROR dns_marshall_request(TALLOC_CTX *mem_ctx,
 			       struct dns_buffer **pbuf)
 {
 	struct dns_buffer *buf;
-	uint16 i;
+	uint16_t i;
 
 	if (!(buf = dns_create_buffer(mem_ctx))) {
 		return ERROR_DNS_NO_MEMORY;
@@ -387,10 +387,10 @@ DNS_ERROR dns_unmarshall_request(TALLOC_CTX *mem_ctx,
 				 struct dns_request **preq)
 {
 	struct dns_request *req;
-	uint16 i;
+	uint16_t 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_zero_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_zero_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_zero_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_zero_array(req, struct dns_rrec *,
 					      req->num_additionals))) {
 		goto error;
 	}
@@ -524,7 +524,7 @@ DNS_ERROR dns_unmarshall_update_request(TALLOC_CTX *mem_ctx,
 				      (struct dns_request **)(void *)pupreq);
 }
 
-uint16 dns_response_code(uint16 flags)
+uint16_t dns_response_code(uint16_t flags)
 {
 	return flags & 0xF;
 }