Changeset 745 for trunk/server/source4/libcli/raw/rawsearch.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/rawsearch.c (modified) (4 diffs)

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

@@ -334 +334 @@
                                const DATA_BLOB *blob,
                                union smb_search_data *data,
-                               uint_t *next_ofs,
-                               uint_t str_flags)
-{
-        uint_t len, blen;
+                               unsigned int *next_ofs,
+                               unsigned int str_flags)
+{
+        unsigned int len, blen;
 
         if (blob->length < 4) {
@@ -488 +488 @@
                                union smb_search_data *data)
 {
-        uint_t len, ofs;
+        unsigned int len, ofs;
         uint32_t ea_size;
         DATA_BLOB eablob;
@@ -657 +657 @@
                 case RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO:
                 case RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO: {
-                        uint_t str_flags = STR_UNICODE;
+                        unsigned int str_flags = STR_UNICODE;
                         if (!(tree->session->transport->negotiate.capabilities & CAP_UNICODE)) {
                                 str_flags = STR_ASCII;
@@ -695 +695 @@
         for (i=0; i < count; i++) {
                 union smb_search_data search_data;
-                uint_t len;
+                unsigned int len;
 
                 len = parse_trans2_search(tree, mem_ctx, level, flags, &blob2, &search_data);