diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-03-12 09:02:02 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-03-12 11:03:50 +0100 |
| commit | 2fdbafbf5475e8936fb5bc3e3bafc7ee19a9b705 (patch) | |
| tree | 1bd64fc48aa1c7e71befa877458a467d45e4bbaf /source3/torture/torture.c | |
| parent | a0a9c5d1709e81a1503c7326147b3d77ab4328c9 (diff) | |
| download | samba-2fdbafbf5475e8936fb5bc3e3bafc7ee19a9b705.tar.gz samba-2fdbafbf5475e8936fb5bc3e3bafc7ee19a9b705.tar.bz2 samba-2fdbafbf5475e8936fb5bc3e3bafc7ee19a9b705.zip | |
Revert "s3:libsmb: add an option to cli_push to let the caller provide the buffers"
This reverts commit 9579a6f193f570e4ce2af80f4aac7c2f25ae5b22.
It's confusing to have a boolean to alter the behavior of cli_push
and as the new feature isn't used yet I revert it.
We can readd a extra function later.
metze
Diffstat (limited to 'source3/torture/torture.c')
| -rw-r--r-- | source3/torture/torture.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 12a4aec9a0..10e541f384 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -5117,9 +5117,7 @@ static bool run_chain1(int dummy) return True; } -static size_t null_source(uint8_t *inbuf, size_t n, - const uint8_t **outbuf, - void *priv) +static size_t null_source(uint8_t *buf, size_t n, void *priv) { size_t *to_pull = (size_t *)priv; size_t thistime = *to_pull; @@ -5129,7 +5127,7 @@ static size_t null_source(uint8_t *inbuf, size_t n, return 0; } - memset(inbuf, 0, thistime); + memset(buf, 0, thistime); *to_pull -= thistime; return thistime; } @@ -5172,7 +5170,7 @@ static bool run_windows_write(int dummy) } status = cli_push(cli1, fnum, 0, i * torture_blocksize, torture_blocksize, - false, null_source, &to_pull); + null_source, &to_pull); if (!NT_STATUS_IS_OK(status)) { printf("cli_push returned: %s\n", nt_errstr(status)); goto fail; |