From f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 16:24:13 +0000 Subject: r884: convert samba4 to use [u]int32_t instead of [u]int32 metze (This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095) --- source4/torture/raw/open.c | 2 +- source4/torture/raw/qfileinfo.c | 6 +++--- source4/torture/raw/qfsinfo.c | 4 ++-- source4/torture/raw/search.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 6b85b243d5..88cadf7b66 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -583,7 +583,7 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx) BOOL ret = True; int i; struct { - uint32 open_disp; + uint32_t open_disp; BOOL with_file; NTSTATUS correct_status; } open_funcs[] = { diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index 14f30db97f..26c94b6a09 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -25,7 +25,7 @@ static struct { enum fileinfo_level level; unsigned only_paths:1; unsigned only_handles:1; - uint32 capability_mask; + uint32_t capability_mask; NTSTATUS fnum_status, fname_status; union smb_fileinfo fnum_finfo, fname_finfo; } levels[] = { @@ -159,7 +159,7 @@ BOOL torture_raw_qfileinfo(int dummy) const char *fname = "\\torture_qfileinfo.txt"; NTTIME correct_time; uint64_t correct_size; - uint32 correct_attrib; + uint32_t correct_attrib; const char *correct_name; BOOL skip_streams = False; @@ -196,7 +196,7 @@ BOOL torture_raw_qfileinfo(int dummy) /* check for completely broken levels */ for (count=i=0; levels[i].name; i++) { - uint32 cap = cli->transport->negotiate.capabilities; + uint32_t cap = cli->transport->negotiate.capabilities; /* see if this server claims to support this level */ if ((cap & levels[i].capability_mask) != levels[i].capability_mask) { continue; diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c index 347b34b3e2..caa47b43f8 100644 --- a/source4/torture/raw/qfsinfo.c +++ b/source4/torture/raw/qfsinfo.c @@ -24,7 +24,7 @@ static struct { const char *name; enum fsinfo_level level; - uint32 capability_mask; + uint32_t capability_mask; NTSTATUS status; union smb_fsinfo fsinfo; } levels[] = { @@ -131,7 +131,7 @@ BOOL torture_raw_qfsinfo(int dummy) /* check for completely broken levels */ for (count=i=0; levels[i].name; i++) { - uint32 cap = cli->transport->negotiate.capabilities; + uint32_t cap = cli->transport->negotiate.capabilities; /* see if this server claims to support this level */ if ((cap & levels[i].capability_mask) != levels[i].capability_mask) { continue; diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index ae5d8c34a8..4f4c453bc8 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -70,7 +70,7 @@ static NTSTATUS single_search(struct cli_state *cli, static struct { const char *name; enum search_level level; - uint32 capability_mask; + uint32_t capability_mask; NTSTATUS status; union smb_search_data data; } levels[] = { @@ -123,7 +123,7 @@ static BOOL test_one_file(struct cli_state *cli, TALLOC_CTX *mem_ctx) /* call all the levels */ for (i=0;itransport->negotiate.capabilities; + uint32_t cap = cli->transport->negotiate.capabilities; printf("testing %s\n", levels[i].name); -- cgit