diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/torture/raw | |
parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/torture/raw')
-rw-r--r-- | source4/torture/raw/context.c | 2 | ||||
-rw-r--r-- | source4/torture/raw/open.c | 4 | ||||
-rw-r--r-- | source4/torture/raw/oplock.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c index 91763da86f..29aa915b5d 100644 --- a/source4/torture/raw/context.c +++ b/source4/torture/raw/context.c @@ -265,7 +265,7 @@ static BOOL test_pid(struct cli_state *cli, TALLOC_CTX *mem_ctx) int fnum; const char *fname = BASEDIR "\\test.txt"; char c = 1; - uint16 pid1, pid2; + uint16_t pid1, pid2; printf("TESTING PID HANDLING\n"); diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 88cadf7b66..8a4e09374b 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -265,7 +265,7 @@ static BOOL test_openx(struct cli_state *cli, TALLOC_CTX *mem_ctx) BOOL ret = True; int i; struct { - uint16 open_func; + uint16_t open_func; BOOL with_file; NTSTATUS correct_status; } open_funcs[] = { @@ -454,7 +454,7 @@ static BOOL test_t2open(struct cli_state *cli, TALLOC_CTX *mem_ctx) BOOL ret = True; int i; struct { - uint16 open_func; + uint16_t open_func; BOOL with_file; NTSTATUS correct_status; } open_funcs[] = { diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 403d19113d..c610f9a78d 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -45,7 +45,7 @@ static struct { /* a handler function for oplock break requests */ -static BOOL oplock_handler_ack(struct cli_transport *transport, uint16 tid, uint16 fnum, uint8 level, void *private) +static BOOL oplock_handler_ack(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private) { struct cli_tree *tree = private; break_info.fnum = fnum; @@ -60,7 +60,7 @@ static BOOL oplock_handler_ack(struct cli_transport *transport, uint16 tid, uint /* a handler function for oplock break requests - close the file */ -static BOOL oplock_handler_close(struct cli_transport *transport, uint16 tid, uint16 fnum, uint8 level, void *private) +static BOOL oplock_handler_close(struct cli_transport *transport, uint16_t tid, uint16_t fnum, uint8 level, void *private) { union smb_close io; NTSTATUS status; @@ -95,7 +95,7 @@ static BOOL test_oplock(struct cli_state *cli, TALLOC_CTX *mem_ctx) union smb_open io; struct smb_unlink unl; union smb_read rd; - uint16 fnum, fnum2; + uint16_t fnum, fnum2; /* cleanup */ cli_unlink(cli->tree, fname); |