diff options
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 4 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/vfs_ipc.c | 16 | ||||
| -rw-r--r-- | source4/ntvfs/reference/ref.h | 4 | ||||
| -rw-r--r-- | source4/ntvfs/simple/svfs.h | 4 | ||||
| -rw-r--r-- | source4/ntvfs/simple/svfs_util.c | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 2a87d59a06..751280ad6c 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -60,7 +60,7 @@ static void idle_func(struct cli_transport *transport, void *p_private) a handler for oplock break events from the server - these need to be passed along to the client */ -static BOOL oplock_handler(struct cli_transport *transport, uint16 tid, uint16 fnum, uint8 level, void *p_private) +static BOOL oplock_handler(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *p_private) { struct cvfs_private *private = p_private; @@ -71,7 +71,7 @@ static BOOL oplock_handler(struct cli_transport *transport, uint16 tid, uint16 f /* a handler for read events on a connection to a backend server */ -static void cifs_socket_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void cifs_socket_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { struct cvfs_private *private = fde->private; struct tcon_context *conn = private->conn; diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index 635b14b821..9a2589a2ee 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -32,17 +32,17 @@ pipes */ struct ipc_private { - uint16 next_fnum; - uint16 num_open; + uint16_t next_fnum; + uint16_t num_open; /* a list of open pipes */ struct pipe_state { struct pipe_state *next, *prev; TALLOC_CTX *mem_ctx; const char *pipe_name; - uint16 fnum; + uint16_t fnum; struct dcesrv_connection *dce_conn; - uint16 ipc_state; + uint16_t ipc_state; } *pipe_list; }; @@ -51,7 +51,7 @@ struct ipc_private { /* find the next fnum available on this connection */ -static uint16 find_next_fnum(struct ipc_private *ipc) +static uint16_t find_next_fnum(struct ipc_private *ipc) { struct pipe_state *p; uint32_t ret; @@ -88,7 +88,7 @@ static void pipe_shutdown(struct ipc_private *private, struct pipe_state *p) /* find a open pipe give a file descriptor */ -static struct pipe_state *pipe_state_find(struct ipc_private *private, uint16 fnum) +static struct pipe_state *pipe_state_find(struct ipc_private *private, uint16_t fnum) { struct pipe_state *p; @@ -369,7 +369,7 @@ static NTSTATUS ipc_read(struct request_context *req, union smb_read *rd) { struct ipc_private *private = req->conn->ntvfs_private; DATA_BLOB data; - uint16 fnum; + uint16_t fnum; struct pipe_state *p; NTSTATUS status; @@ -421,7 +421,7 @@ static NTSTATUS ipc_write(struct request_context *req, union smb_write *wr) { struct ipc_private *private = req->conn->ntvfs_private; DATA_BLOB data; - uint16 fnum; + uint16_t fnum; struct pipe_state *p; NTSTATUS status; diff --git a/source4/ntvfs/reference/ref.h b/source4/ntvfs/reference/ref.h index 00eab76094..8ac4556420 100644 --- a/source4/ntvfs/reference/ref.h +++ b/source4/ntvfs/reference/ref.h @@ -10,7 +10,7 @@ struct rvfs_private { struct search_state *search; /* next available search handle */ - uint16 next_search_handle; + uint16_t next_search_handle; }; struct rvfs_dir { @@ -24,7 +24,7 @@ struct rvfs_dir { struct search_state { struct search_state *next, *prev; TALLOC_CTX *mem_ctx; - uint16 handle; + uint16_t handle; uint_t current_index; struct rvfs_dir *dir; }; diff --git a/source4/ntvfs/simple/svfs.h b/source4/ntvfs/simple/svfs.h index 6e44d290da..373e6dc126 100644 --- a/source4/ntvfs/simple/svfs.h +++ b/source4/ntvfs/simple/svfs.h @@ -7,7 +7,7 @@ struct svfs_private { struct search_state *search; /* next available search handle */ - uint16 next_search_handle; + uint16_t next_search_handle; struct svfs_file *open_files; }; @@ -30,7 +30,7 @@ struct svfs_file { struct search_state { struct search_state *next, *prev; TALLOC_CTX *mem_ctx; - uint16 handle; + uint16_t handle; uint_t current_index; struct svfs_dir *dir; }; diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c index 11e70d72c2..ec1c07dff7 100644 --- a/source4/ntvfs/simple/svfs_util.c +++ b/source4/ntvfs/simple/svfs_util.c @@ -169,9 +169,9 @@ int svfs_file_utime(int fd, struct utimbuf *times) /* map a unix file attrib to a DOS attribute */ -uint16 svfs_unix_to_dos_attrib(mode_t mode) +uint16_t svfs_unix_to_dos_attrib(mode_t mode) { - uint16 ret = 0; + uint16_t ret = 0; if (S_ISDIR(mode)) ret |= FILE_ATTRIBUTE_DIRECTORY; if (!(mode & S_IWUSR)) ret |= FILE_ATTRIBUTE_READONLY; return ret; |