s3:smbd: do casting of dm_sessid_t in steps
authorStefan Metzmacher <metze@samba.org>
Wed, 26 Feb 2014 19:16:26 +0000 (20:16 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 25 Nov 2014 06:25:45 +0000 (07:25 +0100)
This makes it more explicit and avoids compiler warnings.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/dmapi.c

index 8c93873801e585fb189e8cadb09dfa2262e6c435..90c24bd5de562a16ae7581f4b10cbb3d4c2292a1 100644 (file)
@@ -266,18 +266,20 @@ uint32 dmapi_file_flags(const char * const path)
        uint            nevents;
 
        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) {
+       _dmapi_session_ptr = dmapi_get_current_session();
+       if (_dmapi_session_ptr == NULL) {
                return 0;
        }
 
-       dmapi_session = *(const 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;
        }