diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-27 18:10:19 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:02:54 -0500 |
commit | 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 (patch) | |
tree | 5639bb3b7628532080737e4e1b1ff0b835ee4977 /source4/ntvfs | |
parent | 4fb038b0b8e7a4bb69ac0d9022684eeaca8a491a (diff) | |
download | samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.tar.gz samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.tar.bz2 samba-61ffa08f4c95e29d301de9fbabd6e71c2dbc1056.zip |
r24712: No longer expose the 'BOOL' data type in any interfaces.
(This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r-- | source4/ntvfs/common/opendb.h | 6 | ||||
-rw-r--r-- | source4/ntvfs/ntvfs.h | 4 | ||||
-rw-r--r-- | source4/ntvfs/posix/vfs_posix.h | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h index 835fb19046..231ae3d7de 100644 --- a/source4/ntvfs/common/opendb.h +++ b/source4/ntvfs/common/opendb.h @@ -26,16 +26,16 @@ struct opendb_ops { struct odb_context *odb, DATA_BLOB *file_key); NTSTATUS (*odb_open_file)(struct odb_lock *lck, void *file_handle, uint32_t stream_id, uint32_t share_access, - uint32_t access_mask, BOOL delete_on_close, + uint32_t access_mask, bool delete_on_close, const char *path, uint32_t oplock_level, uint32_t *oplock_granted); NTSTATUS (*odb_open_file_pending)(struct odb_lock *lck, void *private); NTSTATUS (*odb_close_file)(struct odb_lock *lck, void *file_handle); NTSTATUS (*odb_remove_pending)(struct odb_lock *lck, void *private); NTSTATUS (*odb_rename)(struct odb_lock *lck, const char *path); - NTSTATUS (*odb_set_delete_on_close)(struct odb_lock *lck, BOOL del_on_close); + NTSTATUS (*odb_set_delete_on_close)(struct odb_lock *lck, bool del_on_close); NTSTATUS (*odb_get_delete_on_close)(struct odb_context *odb, - DATA_BLOB *key, BOOL *del_on_close, + DATA_BLOB *key, bool *del_on_close, int *open_count, char **path); NTSTATUS (*odb_can_open)(struct odb_lock *lck, uint32_t share_access, uint32_t create_options, diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 12a4b3a4df..9ac6f85321 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -91,11 +91,11 @@ struct ntvfs_ops { NTSTATUS (*search_first)(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_search_first *io, void *private, - BOOL (*callback)(void *private, const union smb_search_data *file)); + bool (*callback)(void *private, const union smb_search_data *file)); NTSTATUS (*search_next)(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_search_next *io, void *private, - BOOL (*callback)(void *private, const union smb_search_data *file)); + bool (*callback)(void *private, const union smb_search_data *file)); NTSTATUS (*search_close)(struct ntvfs_module_context *ntvfs, struct ntvfs_request *req, union smb_search_close *io); diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index b08110915b..dcf082fd88 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -118,9 +118,9 @@ struct pvfs_filename { char *full_name; const char *stream_name; /* does not include :$DATA suffix */ uint32_t stream_id; /* this uses a hash, so is probabilistic */ - BOOL has_wildcard; - BOOL exists; /* true if the base filename exists */ - BOOL stream_exists; /* true if the stream exists */ + bool has_wildcard; + bool exists; /* true if the base filename exists */ + bool stream_exists; /* true if the stream exists */ struct stat st; struct pvfs_dos_fileinfo dos; }; @@ -150,16 +150,16 @@ struct pvfs_file_handle { uint64_t seek_offset; uint64_t position; - BOOL have_opendb_entry; + bool have_opendb_entry; /* we need this hook back to our parent for lock destruction */ struct pvfs_state *pvfs; /* have we set a sticky write time that we should remove on close */ - BOOL sticky_write_time; + bool sticky_write_time; /* the open went through to completion */ - BOOL open_completed; + bool open_completed; }; /* open file state */ |