Changeset 988 for vendor/current/source3/smbd/dmapi.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/source3/smbd/dmapi.c (modified) (6 diffs)

vendor/current/source3/smbd/dmapi.c

@@ -28 +28 @@
 #ifndef USE_DMAPI
 
-uint32 dmapi_file_flags(const char * const path) { return 0; }
+uint32_t dmapi_file_flags(const char * const path) { return 0; }
 bool dmapi_have_session(void) { return False; }
 const void * dmapi_get_current_session(void) { return NULL; }
@@ -97 +97 @@
                 dm_sessid_t *new_sessions;
                 nsessions *= 2;
-                new_sessions = TALLOC_REALLOC_ARRAY(tmp_ctx, sessions, 
+                new_sessions = talloc_realloc(tmp_ctx, sessions, 
                                                     dm_sessid_t, nsessions);
                 if (new_sessions == NULL) {
@@ -260 +260 @@
    implementations as well.
 */
-uint32 dmapi_file_flags(const char * const path)
+uint32_t dmapi_file_flags(const char * const path)
 {
         int             err;
@@ -267 +267 @@
 
         dm_sessid_t     dmapi_session;
-        const void      *dmapi_session_ptr;
+        dm_sessid_t     *dmapi_session_ptr;
+        const void      *_dmapi_session_ptr;
         void            *dm_handle = NULL;
         size_t          dm_handle_len = 0;
 
-        uint32          flags = 0;
-
-        dmapi_session_ptr = dmapi_get_current_session();
-        if (dmapi_session_ptr == NULL) {
+        uint32_t        flags = 0;
+
+        _dmapi_session_ptr = dmapi_get_current_session();
+        if (_dmapi_session_ptr == NULL) {
                 return 0;
         }
 
-        dmapi_session = *(dm_sessid_t *)dmapi_session_ptr;
+        dmapi_session_ptr = discard_const_p(dm_sessid_t, _dmapi_session_ptr);
+        dmapi_session = *dmapi_session_ptr;
         if (dmapi_session == DM_NO_SESSION) {
                 return 0;
@@ -290 +292 @@
 #endif
 
-        err = dm_path_to_handle(CONST_DISCARD(char *, path),
+        err = dm_path_to_handle(discard_const_p(char, path),
                 &dm_handle, &dm_handle_len);
         if (err < 0) {
@@ -309 +311 @@
                 set_effective_capability(DMAPI_ACCESS_CAPABILITY);
 
-                err = dm_path_to_handle(CONST_DISCARD(char *, path),
+                err = dm_path_to_handle(discard_const_p(char, path),
                         &dm_handle, &dm_handle_len);
                 if (err < 0) {