From a920f2f9a8e4ee076471c293765ed0bee13d4cc5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 18 Jan 2006 16:20:33 +0000 Subject: r13004: fix compiler warnings metze (This used to be commit 833efdf8a943b210ba8e5b219dc754260001bedb) --- source4/torture/raw/composite.c | 4 ++-- source4/torture/raw/open.c | 2 +- source4/torture/raw/oplock.c | 8 ++++---- source4/torture/raw/search.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index 760d464fb5..6025c3d1e4 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -48,7 +48,7 @@ static BOOL test_loadfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) struct smb_composite_savefile io1; struct smb_composite_loadfile io2; struct composite_context **c; - char *data; + uint8_t *data; size_t len = random() % 100000; const int num_ops = 50; int i; @@ -124,7 +124,7 @@ static BOOL test_fetchfile(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) struct smb_composite_savefile io1; struct smb_composite_fetchfile io2; struct composite_context **c; - char *data; + uint8_t *data; int i; size_t len = random() % 10000; extern int torture_numops; diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 2afad96956..1346a075f2 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -1247,7 +1247,7 @@ static BOOL test_chained(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) io.openxreadx.in.mincnt = sizeof(buf); io.openxreadx.in.maxcnt = sizeof(buf); io.openxreadx.in.remaining = 0; - io.openxreadx.out.data = buf2; + io.openxreadx.out.data = (uint8_t *)buf2; status = smb_raw_open(cli->tree, mem_ctx, &io); CHECK_STATUS(status, NT_STATUS_OK); diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 64da410bd2..6fa4c514b3 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -366,7 +366,7 @@ static BOOL test_oplock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -383,7 +383,7 @@ static BOOL test_oplock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -437,7 +437,7 @@ static BOOL test_oplock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } @@ -454,7 +454,7 @@ static BOOL test_oplock(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) wr.write.in.count = 1; wr.write.in.offset = 0; wr.write.in.remaining = 0; - wr.write.in.data = "x"; + wr.write.in.data = (const uint8_t *)"x"; status = smb_raw_write(cli->tree, &wr); CHECK_STATUS(status, NT_STATUS_OK); } diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 5cb67b068e..1d98c7cb5c 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -1286,14 +1286,14 @@ static BOOL test_ea_list(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) CHECK_STRING(result.list[1].ea_list.name.s, "file2.txt"); CHECK_STRING(result.list[1].ea_list.eas.eas[0].name.s, "SECOND EA"); CHECK_VALUE(result.list[1].ea_list.eas.eas[0].value.length, 9); - CHECK_STRING(result.list[1].ea_list.eas.eas[0].value.data, "Value Two"); + CHECK_STRING((const char *)result.list[1].ea_list.eas.eas[0].value.data, "Value Two"); CHECK_STRING(result.list[1].ea_list.eas.eas[1].name.s, "THIRD EA"); CHECK_VALUE(result.list[1].ea_list.eas.eas[1].value.length, 0); CHECK_STRING(result.list[2].ea_list.name.s, "file3.txt"); CHECK_STRING(result.list[2].ea_list.eas.eas[0].name.s, "SECOND EA"); CHECK_VALUE(result.list[2].ea_list.eas.eas[0].value.length, 9); - CHECK_STRING(result.list[2].ea_list.eas.eas[0].value.data, "Value Two"); + CHECK_STRING((const char *)result.list[2].ea_list.eas.eas[0].value.data, "Value Two"); CHECK_STRING(result.list[2].ea_list.eas.eas[1].name.s, "THIRD EA"); CHECK_VALUE(result.list[2].ea_list.eas.eas[1].value.length, 0); -- cgit