diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-01 12:45:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:28 -0500 |
| commit | 467ec2a32bac08468855a5a28a7d6e25b26904d5 (patch) | |
| tree | bc04c0e4a90ad694699d78cfbac7b6671813aade /source3/torture | |
| parent | fbd04d65c56c36bec287f6c4ffe84ea79b048fa7 (diff) | |
| download | samba-467ec2a32bac08468855a5a28a7d6e25b26904d5.tar.gz samba-467ec2a32bac08468855a5a28a7d6e25b26904d5.tar.bz2 samba-467ec2a32bac08468855a5a28a7d6e25b26904d5.zip | |
r17363: Some C++ warnings
(This used to be commit fd82f185a2e0f94bfb75f4eee072556ad94bf27d)
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/denytest.c | 8 | ||||
| -rw-r--r-- | source3/torture/nbio.c | 4 | ||||
| -rw-r--r-- | source3/torture/pdbtest.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c index d82376088f..2dc5c2b634 100644 --- a/source3/torture/denytest.c +++ b/source3/torture/denytest.c @@ -1447,10 +1447,10 @@ BOOL torture_denytest1(int dummy) } else { char x = 1; res = A_0; - if (cli_read(cli1, fnum2, (void *)&x, 0, 1) == 1) { + if (cli_read(cli1, fnum2, (char *)&x, 0, 1) == 1) { res += A_R; } - if (cli_write(cli1, fnum2, 0, (void *)&x, 0, 1) == 1) { + if (cli_write(cli1, fnum2, 0, (char *)&x, 0, 1) == 1) { res += A_W; } } @@ -1531,10 +1531,10 @@ BOOL torture_denytest2(int dummy) } else { char x = 1; res = A_0; - if (cli_read(cli2, fnum2, (void *)&x, 0, 1) == 1) { + if (cli_read(cli2, fnum2, (char *)&x, 0, 1) == 1) { res += A_R; } - if (cli_write(cli2, fnum2, 0, (void *)&x, 0, 1) == 1) { + if (cli_write(cli2, fnum2, 0, (char *)&x, 0, 1) == 1) { res += A_W; } } diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 795392ae5c..9b2d58c86e 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -34,7 +34,7 @@ static struct { int handle; } ftable[MAX_FILES]; -static struct { +static struct children { double bytes_in, bytes_out; int line; int done; @@ -70,7 +70,7 @@ void nb_alarm(int ignore) void nbio_shmem(int n) { nprocs = n; - children = shm_setup(sizeof(*children) * nprocs); + children = (struct children *)shm_setup(sizeof(*children) * nprocs); if (!children) { printf("Failed to setup shared memory!\n"); exit(1); diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c index e1a35b7912..8b15f9629b 100644 --- a/source3/torture/pdbtest.c +++ b/source3/torture/pdbtest.c @@ -291,9 +291,9 @@ int main(int argc, char **argv) pdb_get_account_policy(AP_PASSWORD_HISTORY, &history); if (history * PW_HISTORY_ENTRY_LEN < NT_HASH_LEN) { - buf = TALLOC(ctx, NT_HASH_LEN); + buf = (uint8 *)TALLOC(ctx, NT_HASH_LEN); } else { - buf = TALLOC(ctx, history * PW_HISTORY_ENTRY_LEN); + buf = (uint8 *)TALLOC(ctx, history * PW_HISTORY_ENTRY_LEN); } /* Generate some random hashes */ |