sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

smbtorture: rename CHECK_VALUE() to CHECK_VAL() in smb2/compound.c

Browse Source 
Prepares for using macros from lease_break_handler.h which makes use of
CHECK_VAL() while relying on a definition of CHECK_VAL() in the .c file.

While at it, add a goto done which is always a good thing to get clear failures
from tests.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15697

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 4932b433ff)
This commit is contained in:
Ralph Boehme 2024-10-17 17:44:13 +02:00 committed by Jule Anger
parent 622bcc5518
commit 6c4a0272e7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/torture/smb2/compound.c
View File

@ -37,12 +37,13 @@
goto done; \
}} while (0)
#define CHECK_VALUE(v, correct) do { \
#define CHECK_VAL(v, correct) do { \
if ((v) != (correct)) { \
torture_result(tctx, TORTURE_FAIL, \
"(%s) Incorrect value %s=%d - should be %d\n", \
__location__, #v, (int)v, (int)correct); \
ret = false; \
goto done; \
}} while (0)
#define WAIT_FOR_ASYNC_RESPONSE(req) \
@ -1191,7 +1192,7 @@ static bool test_compound_padding(struct torture_context *tctx,
* size must be 24: 16 byte read response header plus 3
* requested bytes padded to an 8 byte boundary.
*/
CHECK_VALUE(req[1]->in.body_size, 24);
CHECK_VAL(req[1]->in.body_size, 24);
status = smb2_read_recv(req[1], tree, &r);
CHECK_STATUS(status, NT_STATUS_OK);
@ -1262,7 +1263,7 @@ static bool test_compound_padding(struct torture_context *tctx,
* size must be 24: 16 byte read response header plus 3
* requested bytes padded to an 8 byte boundary.
*/
CHECK_VALUE(req[1]->in.body_size, 24);
CHECK_VAL(req[1]->in.body_size, 24);
status = smb2_read_recv(req[1], tree, &r);
CHECK_STATUS(status, NT_STATUS_OK);
@ -1303,8 +1304,8 @@ static bool test_compound_padding(struct torture_context *tctx,
* size must be 24: 16 byte read response header plus 3
* requested bytes padded to an 8 byte boundary.
*/
CHECK_VALUE(req[0]->in.body_size, 24);
CHECK_VALUE(req[1]->in.body_size, 24);
CHECK_VAL(req[0]->in.body_size, 24);
CHECK_VAL(req[1]->in.body_size, 24);
status = smb2_read_recv(req[0], tree, &r);
CHECK_STATUS(status, NT_STATUS_OK);
@ -1336,7 +1337,7 @@ static bool test_compound_padding(struct torture_context *tctx,
* size must be 19: 16 byte read response header plus 3
* requested bytes without padding.
*/
CHECK_VALUE(req[0]->in.body_size, 19);
CHECK_VAL(req[0]->in.body_size, 19);
status = smb2_read_recv(req[0], tree, &r);
CHECK_STATUS(status, NT_STATUS_OK);
@ -2392,7 +2393,7 @@ static bool test_compound_async_write_write(struct torture_context *tctx,
* as it's the last element of a compound.
*/
WAIT_FOR_ASYNC_RESPONSE(req[1]);
CHECK_VALUE(req[1]->cancel.can_cancel, true);
CHECK_VAL(req[1]->cancel.can_cancel, true);
/*
* Now pick up the real return.
*/
@ -2496,7 +2497,7 @@ static bool test_compound_async_read_read(struct torture_context *tctx,
* as it's the last element of a compound.
*/
WAIT_FOR_ASYNC_RESPONSE(req[1]);
CHECK_VALUE(req[1]->cancel.can_cancel, true);
CHECK_VAL(req[1]->cancel.can_cancel, true);
/*
* Now pick up the real return.
*/