From f88bf54c7f6d1c2ef833047eb8327953c304b5ff Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 17:24:24 +0000 Subject: r889: convert samba4 to use [u]int16_t instead of [u]int16 metze (This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3) --- source4/torture/basic/aliases.c | 18 +++++++++--------- source4/torture/basic/scanner.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/torture/basic') diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index c4d6f94700..9fe2baa300 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -24,7 +24,7 @@ int create_complex_file(struct cli_state *cli, TALLOC_CTX *mem_ctx, const char * struct trans2_blobs { struct trans2_blobs *next, *prev; - uint16 level; + uint16_t level; DATA_BLOB params, data; }; @@ -32,7 +32,7 @@ struct trans2_blobs { static void gen_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_offset) { TALLOC_CTX *mem_ctx; - uint16 level; + uint16_t level; struct trans2_blobs *alias_blobs = NULL; struct trans2_blobs *t2b, *t2b2; int count=0, alias_count=0; @@ -81,7 +81,7 @@ static void gen_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_ static void qfsinfo_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_QFSINFO; + uint16_t setup = TRANSACT2_QFSINFO; d_printf("\nChecking for QFSINFO aliases\n"); @@ -102,7 +102,7 @@ static void qfsinfo_aliases(struct cli_state *cli) static void qfileinfo_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_QFILEINFO; + uint16_t setup = TRANSACT2_QFILEINFO; const char *fname = "\\qfileinfo_aliases.txt"; int fnum; @@ -139,7 +139,7 @@ static void qfileinfo_aliases(struct cli_state *cli) static void qpathinfo_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_QPATHINFO; + uint16_t setup = TRANSACT2_QPATHINFO; const char *fname = "\\qpathinfo_aliases.txt"; int fnum; TALLOC_CTX *mem_ctx; @@ -183,7 +183,7 @@ static void qpathinfo_aliases(struct cli_state *cli) static void findfirst_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_FINDFIRST; + uint16_t setup = TRANSACT2_FINDFIRST; const char *fname = "\\findfirst_aliases.txt"; int fnum; TALLOC_CTX *mem_ctx; @@ -232,7 +232,7 @@ static void findfirst_aliases(struct cli_state *cli) static void gen_set_aliases(struct cli_state *cli, struct smb_trans2 *t2, int level_offset) { TALLOC_CTX *mem_ctx; - uint16 level; + uint16_t level; struct trans2_blobs *alias_blobs = NULL; struct trans2_blobs *t2b; int count=0, dsize; @@ -298,7 +298,7 @@ static void gen_set_aliases(struct cli_state *cli, struct smb_trans2 *t2, int le static void setfileinfo_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_SETFILEINFO; + uint16_t setup = TRANSACT2_SETFILEINFO; const char *fname = "\\setfileinfo_aliases.txt"; int fnum; @@ -335,7 +335,7 @@ static void setfileinfo_aliases(struct cli_state *cli) static void setpathinfo_aliases(struct cli_state *cli) { struct smb_trans2 t2; - uint16 setup = TRANSACT2_SETPATHINFO; + uint16_t setup = TRANSACT2_SETPATHINFO; const char *fname = "\\setpathinfo_aliases.txt"; int fnum; TALLOC_CTX *mem_ctx; diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index 7368528200..cf513414e8 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -53,7 +53,7 @@ static NTSTATUS try_trans2(struct cli_state *cli, { NTSTATUS status; struct smb_trans2 t2; - uint16 setup = op; + uint16_t setup = op; TALLOC_CTX *mem_ctx; mem_ctx = talloc_init("try_trans2"); -- cgit