Changeset 745 for trunk/server/source4/libcli/raw/raweas.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/raw/raweas.c (modified) (17 diffs)

trunk/server/source4/libcli/raw/raweas.c

@@ -27 +27 @@
   reasonable assumption
 */
-size_t ea_list_size(uint_t num_eas, struct ea_struct *eas)
-{
-        uint_t total = 4;
+size_t ea_list_size(unsigned int num_eas, struct ea_struct *eas)
+{
+        unsigned int total = 4;
         int i;
         for (i=0;i<num_eas;i++) {
@@ -40 +40 @@
   work out how many bytes on the wire a ea name list will consume. 
 */
-static uint_t ea_name_list_size(uint_t num_names, struct ea_name *eas)
-{
-        uint_t total = 4;
+static unsigned int ea_name_list_size(unsigned int num_names, struct ea_name *eas)
+{
+        unsigned int total = 4;
         int i;
         for (i=0;i<num_names;i++) {
@@ -55 +55 @@
   reasonable assumption
 */
-size_t ea_list_size_chained(uint_t num_eas, struct ea_struct *eas, unsigned alignment)
-{
-        uint_t total = 0;
+size_t ea_list_size_chained(unsigned int num_eas, struct ea_struct *eas, unsigned alignment)
+{
+        unsigned int total = 0;
         int i;
         for (i=0;i<num_eas;i++) {
-                uint_t len = 8 + strlen(eas[i].name.s)+1 + eas[i].value.length;
+                unsigned int len = 8 + strlen(eas[i].name.s)+1 + eas[i].value.length;
                 len = (len + (alignment-1)) & ~(alignment-1);
                 total += len;
@@ -71 +71 @@
   of size ea_list_size()
 */
-void ea_put_list(uint8_t *data, uint_t num_eas, struct ea_struct *eas)
+void ea_put_list(uint8_t *data, unsigned int num_eas, struct ea_struct *eas)
 {
         int i;
@@ -82 +82 @@
 
         for (i=0;i<num_eas;i++) {
-                uint_t nlen = strlen(eas[i].name.s);
+                unsigned int nlen = strlen(eas[i].name.s);
                 SCVAL(data, 0, eas[i].flags);
                 SCVAL(data, 1, nlen);
@@ -97 +97 @@
   at least of size ea_list_size()
 */
-void ea_put_list_chained(uint8_t *data, uint_t num_eas, struct ea_struct *eas,
+void ea_put_list_chained(uint8_t *data, unsigned int num_eas, struct ea_struct *eas,
                          unsigned alignment)
 {
@@ -103 +103 @@
 
         for (i=0;i<num_eas;i++) {
-                uint_t nlen = strlen(eas[i].name.s);
+                unsigned int nlen = strlen(eas[i].name.s);
                 uint32_t len = 8+nlen+1+eas[i].value.length;
-                uint_t pad = ((len + (alignment-1)) & ~(alignment-1)) - len;
+                unsigned int pad = ((len + (alignment-1)) & ~(alignment-1)) - len;
                 if (i == num_eas-1) {
                         SIVAL(data, 0, 0);
@@ -125 +125 @@
   pull a ea_struct from a buffer. Return the number of bytes consumed
 */
-uint_t ea_pull_struct(const DATA_BLOB *blob, 
+unsigned int ea_pull_struct(const DATA_BLOB *blob,
                       TALLOC_CTX *mem_ctx,
                       struct ea_struct *ea)
@@ -165 +165 @@
 NTSTATUS ea_pull_list(const DATA_BLOB *blob, 
                       TALLOC_CTX *mem_ctx,
-                      uint_t *num_eas, struct ea_struct **eas)
+                      unsigned int *num_eas, struct ea_struct **eas)
 {
         int n;
@@ -185 +185 @@
 
         while (ofs < ea_size) {
-                uint_t len;
+                unsigned int len;
                 DATA_BLOB blob2;
 
@@ -214 +214 @@
 NTSTATUS ea_pull_list_chained(const DATA_BLOB *blob, 
                               TALLOC_CTX *mem_ctx,
-                              uint_t *num_eas, struct ea_struct **eas)
+                              unsigned int *num_eas, struct ea_struct **eas)
 {
         int n;
@@ -229 +229 @@
 
         while (ofs < blob->length) {
-                uint_t len;
+                unsigned int len;
                 DATA_BLOB blob2;
                 uint32_t next_ofs = IVAL(blob->data, ofs);
@@ -262 +262 @@
   pull a ea_name from a buffer. Return the number of bytes consumed
 */
-static uint_t ea_pull_name(const DATA_BLOB *blob, 
+static unsigned int ea_pull_name(const DATA_BLOB *blob,
                            TALLOC_CTX *mem_ctx,
                            struct ea_name *ea)
@@ -290 +290 @@
 NTSTATUS ea_pull_name_list(const DATA_BLOB *blob, 
                            TALLOC_CTX *mem_ctx,
-                           uint_t *num_names, struct ea_name **ea_names)
+                           unsigned int *num_names, struct ea_name **ea_names)
 {
         int n;
@@ -310 +310 @@
 
         while (ofs < ea_size) {
-                uint_t len;
+                unsigned int len;
                 DATA_BLOB blob2;
 
@@ -338 +338 @@
 */
 bool ea_push_name_list(TALLOC_CTX *mem_ctx,
-                       DATA_BLOB *data, uint_t num_names, struct ea_name *eas)
+                       DATA_BLOB *data, unsigned int num_names, struct ea_name *eas)
 {
         int i;
@@ -355 +355 @@
 
         for (i=0;i<num_names;i++) {
-                uint_t nlen = strlen(eas[i].name.s);
+                unsigned int nlen = strlen(eas[i].name.s);
                 SCVAL(data->data, off, nlen);
                 memcpy(data->data+off+1, eas[i].name.s, nlen+1);