diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-30 15:26:43 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-30 15:26:43 -0700 |
| commit | 8cf78ff55312768d0b454b1d7e0560e04e6296da (patch) | |
| tree | 0a2180f063e3bb9872c2565c92075dfb5dccac81 /source3/libsmb/clireadwrite.c | |
| parent | ab4b8c9c0438bc5afca17e3ebf05dde6f98bc0aa (diff) | |
| download | samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.tar.gz samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.tar.bz2 samba-8cf78ff55312768d0b454b1d7e0560e04e6296da.zip | |
Get medieval on our ass about SMB1 file descriptors being 16 bits, not an int.
Convert all uses of cli_open(), cli_nt_createXXX to NTSTATUS versions.
This is smaller than it looks, it just fixes a lot of old code.
Next up, ensure all cli_XX functions return NTSTATUS.
Jeremy.
Diffstat (limited to 'source3/libsmb/clireadwrite.c')
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 1d2f5f79ec..07d438fd25 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -82,7 +82,7 @@ static void cli_read_andx_done(struct tevent_req *subreq); struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, struct event_context *ev, - struct cli_state *cli, int fnum, + struct cli_state *cli, uint16_t fnum, off_t offset, size_t size, struct tevent_req **psmbreq) { @@ -135,7 +135,7 @@ struct tevent_req *cli_read_andx_create(TALLOC_CTX *mem_ctx, struct tevent_req *cli_read_andx_send(TALLOC_CTX *mem_ctx, struct event_context *ev, - struct cli_state *cli, int fnum, + struct cli_state *cli, uint16_t fnum, off_t offset, size_t size) { struct tevent_req *req, *subreq; @@ -554,7 +554,7 @@ static NTSTATUS cli_read_sink(char *buf, size_t n, void *priv) return NT_STATUS_OK; } -ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, +ssize_t cli_read(struct cli_state *cli, uint16_t fnum, char *buf, off_t offset, size_t size) { NTSTATUS status; @@ -574,7 +574,7 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, ****************************************************************************/ static bool cli_issue_write(struct cli_state *cli, - int fnum, + uint16_t fnum, off_t offset, uint16 mode, const char *buf, @@ -674,7 +674,7 @@ static bool cli_issue_write(struct cli_state *cli, ****************************************************************************/ ssize_t cli_write(struct cli_state *cli, - int fnum, uint16 write_mode, + uint16_t fnum, uint16 write_mode, const char *buf, off_t offset, size_t size) { ssize_t bwritten = 0; @@ -735,7 +735,7 @@ ssize_t cli_write(struct cli_state *cli, ****************************************************************************/ ssize_t cli_smbwrite(struct cli_state *cli, - int fnum, char *buf, off_t offset, size_t size1) + uint16_t fnum, char *buf, off_t offset, size_t size1) { char *p; ssize_t total = 0; |