Changeset 988 for vendor/current/lib/addns/dnsmarshall.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/addns/dnsmarshall.c (modified) (16 diffs)

vendor/current/lib/addns/dnsmarshall.c

@@ -40 +40 @@
         result->size = 2;
 
-        if (!(result->data = TALLOC_ZERO_ARRAY(result, uint8, result->size))) {
+        if (!(result->data = talloc_zero_array(result, uint8_t, result->size))) {
                 TALLOC_FREE(result);
                 return NULL;
@@ -48 +48 @@
 }
 
-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)
 {
@@ -71 +71 @@
         if (buf->offset + len > buf->size) {
                 size_t new_size = buf->offset + len;
-                uint8 *new_data;
+                uint8_t *new_data;
 
                 /*
@@ -79 +79 @@
                 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_t,
                                                       new_size))) {
                         buf->error = ERROR_DNS_NO_MEMORY;
@@ -94 +94 @@
 }
 
-void dns_marshall_uint16(struct dns_buffer *buf, uint16 val)
-{
-        uint16 n_val = htons(val);
-        dns_marshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
-}
-
-void dns_marshall_uint32(struct dns_buffer *buf, uint32 val)
-{
-        uint32 n_val = htonl(val);
-        dns_marshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
-}
-
-void dns_unmarshall_buffer(struct dns_buffer *buf, uint8 *data,
+void dns_marshall_uint16(struct dns_buffer *buf, uint16_t 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_t 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_t *data,
                            size_t len)
 {
@@ -122 +122 @@
 }
 
-void dns_unmarshall_uint16(struct dns_buffer *buf, uint16 *val)
-{
-        uint16 n_val;
-
-        dns_unmarshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+void dns_unmarshall_uint16(struct dns_buffer *buf, uint16_t *val)
+{
+        uint16_t n_val;
+
+        dns_unmarshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
         if (!(ERR_DNS_IS_OK(buf->error))) return;
 
@@ -132 +132 @@
 }
 
-void dns_unmarshall_uint32(struct dns_buffer *buf, uint32 *val)
-{
-        uint32 n_val;
-
-        dns_unmarshall_buffer(buf, (uint8 *)&n_val, sizeof(n_val));
+void dns_unmarshall_uint32(struct dns_buffer *buf, uint32_t *val)
+{
+        uint32_t n_val;
+
+        dns_unmarshall_buffer(buf, (uint8_t *)&n_val, sizeof(n_val));
         if (!(ERR_DNS_IS_OK(buf->error))) return;
 
@@ -153 +153 @@
 
         for (label = name->pLabelList; label != NULL; label = label->next) {
-                uint8 len = label->len;
-
-                dns_marshall_buffer(buf, (uint8 *)&len, sizeof(len));
+                uint8_t len = label->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);
 }
 
@@ -171 +171 @@
 {
         struct dns_domain_label *label;
-        uint8 len;
+        uint8_t len;
 
         if (!ERR_DNS_IS_OK(buf->error)) return;
@@ -197 +197 @@
                  */
                 struct dns_buffer new_buf;
-                uint8 low;
+                uint8_t low;
 
                 dns_unmarshall_buffer(buf, &low, sizeof(low));
@@ -224 +224 @@
         label->len = len;
 
-        if (!(label->label = TALLOC_ZERO_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;
 
@@ -330 +330 @@
 
         if (r->data_length != 0) {
-                if (!(r->data = TALLOC_ZERO_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;
@@ -347 +347 @@
 {
         struct dns_buffer *buf;
-        uint16 i;
+        uint16_t i;
 
         if (!(buf = dns_create_buffer(mem_ctx))) {
@@ -388 +388 @@
 {
         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;
         }
@@ -407 +407 @@
 
         if ((req->num_questions != 0) &&
-            !(req->questions = TALLOC_ZERO_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_ZERO_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_ZERO_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_ZERO_ARRAY(req, struct dns_rrec *,
+            !(req->additionals = talloc_zero_array(req, struct dns_rrec *,
                                               req->num_additionals))) {
                 goto error;
@@ -525 +525 @@
 }
 
-uint16 dns_response_code(uint16 flags)
+uint16_t dns_response_code(uint16_t flags)
 {
         return flags & 0xF;