diff options
author | Matt Kraai <mkraai@beckman.com> | 2010-01-05 09:42:54 -0800 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2010-02-02 07:18:18 +0100 |
commit | d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022 (patch) | |
tree | 9ee0823d8f3e43217989f15c442ab747e84d22c2 /source4/ntvfs/posix | |
parent | a47b6ebb3036f5073fdb2320b584345d3604c38d (diff) | |
download | samba-d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022.tar.gz samba-d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022.tar.bz2 samba-d8071e7ed7c57e8b0f2d80420e27f9ea7ab63022.zip |
Change uint_t to unsigned int in source4
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r-- | source4/ntvfs/posix/pvfs_fileinfo.c | 2 | ||||
-rw-r--r-- | source4/ntvfs/posix/pvfs_fsinfo.c | 2 | ||||
-rw-r--r-- | source4/ntvfs/posix/pvfs_qfileinfo.c | 2 | ||||
-rw-r--r-- | source4/ntvfs/posix/pvfs_resolve.c | 12 | ||||
-rw-r--r-- | source4/ntvfs/posix/pvfs_search.c | 16 | ||||
-rw-r--r-- | source4/ntvfs/posix/vfs_posix.h | 12 |
6 files changed, 23 insertions, 23 deletions
diff --git a/source4/ntvfs/posix/pvfs_fileinfo.c b/source4/ntvfs/posix/pvfs_fileinfo.c index a14c8f64ae..a372383daa 100644 --- a/source4/ntvfs/posix/pvfs_fileinfo.c +++ b/source4/ntvfs/posix/pvfs_fileinfo.c @@ -53,7 +53,7 @@ static uint32_t dos_mode_from_stat(struct pvfs_state *pvfs, struct stat *st) fill in the dos file attributes for a file */ NTSTATUS pvfs_fill_dos_info(struct pvfs_state *pvfs, struct pvfs_filename *name, - uint_t flags, int fd) + unsigned int flags, int fd) { NTSTATUS status; DATA_BLOB lkey; diff --git a/source4/ntvfs/posix/pvfs_fsinfo.c b/source4/ntvfs/posix/pvfs_fsinfo.c index 10fb7cf707..210433baef 100644 --- a/source4/ntvfs/posix/pvfs_fsinfo.c +++ b/source4/ntvfs/posix/pvfs_fsinfo.c @@ -88,7 +88,7 @@ NTSTATUS pvfs_fsinfo(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); uint64_t blocks_free, blocks_total; - uint_t bpunit; + unsigned int bpunit; struct stat st; const uint16_t block_size = 512; diff --git a/source4/ntvfs/posix/pvfs_qfileinfo.c b/source4/ntvfs/posix/pvfs_qfileinfo.c index b6c1d4f497..e54fc2d669 100644 --- a/source4/ntvfs/posix/pvfs_qfileinfo.c +++ b/source4/ntvfs/posix/pvfs_qfileinfo.c @@ -76,7 +76,7 @@ static uint32_t pvfs_fileinfo_access(union smb_fileinfo *info) */ NTSTATUS pvfs_query_ea_list(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, struct pvfs_filename *name, int fd, - uint_t num_names, + unsigned int num_names, struct ea_name *names, struct smb_ea_list *eas) { diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 8f462648bd..9613b7078a 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -59,7 +59,7 @@ static int component_compare(struct pvfs_state *pvfs, const char *comp, const ch */ static NTSTATUS pvfs_case_search(struct pvfs_state *pvfs, struct pvfs_filename *name, - uint_t flags) + unsigned int flags) { /* break into a series of components */ int num_components; @@ -256,7 +256,7 @@ static NTSTATUS parse_stream_name(struct smb_iconv_convenience *ic, errors are returned if the filename is illegal given the flags */ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, - uint_t flags, struct pvfs_filename *name) + unsigned int flags, struct pvfs_filename *name) { char *ret, *p, *p_start; struct smb_iconv_convenience *ic = NULL; @@ -389,7 +389,7 @@ static NTSTATUS pvfs_unix_path(struct pvfs_state *pvfs, const char *cifs_name, */ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, - const char **fname, uint_t flags) + const char **fname, unsigned int flags) { codepoint_t c; size_t c_size, len; @@ -511,7 +511,7 @@ static NTSTATUS pvfs_reduce_name(TALLOC_CTX *mem_ctx, NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, struct ntvfs_request *req, const char *cifs_name, - uint_t flags, struct pvfs_filename **name) + unsigned int flags, struct pvfs_filename **name) { NTSTATUS status; @@ -610,7 +610,7 @@ NTSTATUS pvfs_resolve_name(struct pvfs_state *pvfs, */ NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, const char *unix_dir, const char *fname, - uint_t flags, struct pvfs_filename **name) + unsigned int flags, struct pvfs_filename **name) { NTSTATUS status; @@ -647,7 +647,7 @@ NTSTATUS pvfs_resolve_partial(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, to update the pvfs_filename stat information, and by pvfs_open() */ NTSTATUS pvfs_resolve_name_fd(struct pvfs_state *pvfs, int fd, - struct pvfs_filename *name, uint_t flags) + struct pvfs_filename *name, unsigned int flags) { dev_t device = (dev_t)0; ino_t inode = 0; diff --git a/source4/ntvfs/posix/pvfs_search.c b/source4/ntvfs/posix/pvfs_search.c index d0d2620648..e6b53ee623 100644 --- a/source4/ntvfs/posix/pvfs_search.c +++ b/source4/ntvfs/posix/pvfs_search.c @@ -232,10 +232,10 @@ static NTSTATUS fill_search_info(struct pvfs_state *pvfs, the search fill loop */ static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx, - uint_t max_count, + unsigned int max_count, struct pvfs_search_state *search, enum smb_search_data_level level, - uint_t *reply_count, + unsigned int *reply_count, void *search_private, bool (*callback)(void *, const union smb_search_data *)) { @@ -323,7 +323,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t search_attrib; const char *pattern; NTSTATUS status; @@ -415,7 +415,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs, void *p; struct pvfs_search_state *search; struct pvfs_dir *dir; - uint_t reply_count, max_count; + unsigned int reply_count, max_count; uint16_t handle; NTSTATUS status; @@ -467,7 +467,7 @@ static NTSTATUS pvfs_search_first_trans2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t search_attrib, max_count; const char *pattern; NTSTATUS status; @@ -565,7 +565,7 @@ static NTSTATUS pvfs_search_next_trans2(struct ntvfs_module_context *ntvfs, void *p; struct pvfs_search_state *search; struct pvfs_dir *dir; - uint_t reply_count; + unsigned int reply_count; uint16_t handle; NTSTATUS status; @@ -629,7 +629,7 @@ static NTSTATUS pvfs_search_first_smb2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t max_count; const char *pattern; NTSTATUS status; @@ -732,7 +732,7 @@ static NTSTATUS pvfs_search_next_smb2(struct ntvfs_module_context *ntvfs, struct pvfs_state *pvfs = talloc_get_type(ntvfs->private_data, struct pvfs_state); struct pvfs_search_state *search; - uint_t reply_count; + unsigned int reply_count; uint16_t max_count; NTSTATUS status; struct pvfs_file *f; diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h index 7341d0d9ca..6354f7558f 100644 --- a/source4/ntvfs/posix/vfs_posix.h +++ b/source4/ntvfs/posix/vfs_posix.h @@ -40,7 +40,7 @@ struct pvfs_state { struct GUID *base_fs_uuid; const char *share_name; - uint_t flags; + unsigned int flags; struct pvfs_mangle_context *mangle_ctx; @@ -54,13 +54,13 @@ struct pvfs_state { struct pvfs_wait *wait_list; /* the sharing violation timeout (nsecs) */ - uint_t sharing_violation_delay; + unsigned int sharing_violation_delay; /* the oplock break timeout (secs) */ - uint_t oplock_break_timeout; + unsigned int oplock_break_timeout; /* the write time update delay (nsecs) */ - uint_t writetime_delay; + unsigned int writetime_delay; /* filesystem attributes (see FS_ATTR_*) */ uint32_t fs_attribs; @@ -84,7 +84,7 @@ struct pvfs_state { struct pvfs_search_state *list; /* how long to keep inactive searches around for */ - uint_t inactivity_time; + unsigned int inactivity_time; } search; /* used to accelerate acl mapping */ @@ -223,7 +223,7 @@ struct pvfs_search_state { uint16_t must_attrib; struct pvfs_dir *dir; time_t last_used; - uint_t num_ea_names; + unsigned int num_ea_names; struct ea_name *ea_names; struct tevent_timer *te; }; |