diff options
| author | Jeremy Allison <jra@samba.org> | 2011-05-05 16:19:49 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-06 01:44:07 +0200 |
| commit | 7d6ebe0de7d99c20854cafb8af50fe8f30ed778a (patch) | |
| tree | 718a3cfdae0a8c6db47245d028bd043c4df0c09e /source3/smbd | |
| parent | 76f5a39c7f165c656cdc9db29bfa0df59514fceb (diff) | |
| download | samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.gz samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.tar.bz2 samba-7d6ebe0de7d99c20854cafb8af50fe8f30ed778a.zip | |
More const fixes. Remove CONST_DISCARD.
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/dmapi.c | 4 | ||||
| -rw-r--r-- | source3/smbd/filename.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c index 2869b6d781..28440783ab 100644 --- a/source3/smbd/dmapi.c +++ b/source3/smbd/dmapi.c @@ -289,7 +289,7 @@ uint32 dmapi_file_flags(const char * const path) become_root(); #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) { DEBUG(DMAPI_TRACE, ("dm_path_to_handle(%s): %s\n", @@ -308,7 +308,7 @@ uint32 dmapi_file_flags(const char * const path) 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) { DEBUG(DMAPI_TRACE, diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index f09dd12013..ec8d1139fa 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -163,7 +163,7 @@ static NTSTATUS check_parent_exists(TALLOC_CTX *ctx, * last compnent to shorten the tree walk. */ /* - * Safe to use CONST_DISCARD + * Safe to use discard_const_p * here as last_component points * into our smb_fname->base_name. */ |