From 9225c02aee19478fc4825c4b798a6757d140b5c0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 18 Mar 2006 09:07:47 +0000 Subject: r14539: get rid of a pointless union layer in struct smb_notify (This used to be commit 1e1c5593817e84c59c1a10b5a3c1957e363e5198) --- source4/torture/raw/notify.c | 90 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'source4/torture/raw') diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index 617eddf73f..38b1fe64b3 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -59,7 +59,7 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) { BOOL ret = True; NTSTATUS status; - union smb_notify notify; + struct smb_notify notify; union smb_open io; int i, count, fnum, fnum2; struct smbcli_request *req, *req2; @@ -93,10 +93,10 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) /* ask for a change notify, on file or directory name changes */ - notify.notify.in.buffer_size = 1000; - notify.notify.in.completion_filter = FILE_NOTIFY_CHANGE_NAME; - notify.notify.in.file.fnum = fnum; - notify.notify.in.recursive = True; + notify.in.buffer_size = 1000; + notify.in.completion_filter = FILE_NOTIFY_CHANGE_NAME; + notify.in.file.fnum = fnum; + notify.in.recursive = True; printf("testing notify cancel\n"); @@ -113,9 +113,9 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, 1); - CHECK_VAL(notify.notify.out.changes[0].action, NOTIFY_ACTION_ADDED); - CHECK_WSTR(notify.notify.out.changes[0].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.num_changes, 1); + CHECK_VAL(notify.out.changes[0].action, NOTIFY_ACTION_ADDED); + CHECK_WSTR(notify.out.changes[0].name, "subdir-name", STR_UNICODE); printf("testing notify rmdir\n"); @@ -124,9 +124,9 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, 1); - CHECK_VAL(notify.notify.out.changes[0].action, NOTIFY_ACTION_REMOVED); - CHECK_WSTR(notify.notify.out.changes[0].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.num_changes, 1); + CHECK_VAL(notify.out.changes[0].action, NOTIFY_ACTION_REMOVED); + CHECK_WSTR(notify.out.changes[0].name, "subdir-name", STR_UNICODE); printf("testing notify mkdir - rmdir - mkdir - rmdir\n"); @@ -137,15 +137,15 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) req = smb_raw_changenotify_send(cli->tree, ¬ify); status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, 4); - CHECK_VAL(notify.notify.out.changes[0].action, NOTIFY_ACTION_ADDED); - CHECK_WSTR(notify.notify.out.changes[0].name, "subdir-name", STR_UNICODE); - CHECK_VAL(notify.notify.out.changes[1].action, NOTIFY_ACTION_REMOVED); - CHECK_WSTR(notify.notify.out.changes[1].name, "subdir-name", STR_UNICODE); - CHECK_VAL(notify.notify.out.changes[2].action, NOTIFY_ACTION_ADDED); - CHECK_WSTR(notify.notify.out.changes[2].name, "subdir-name", STR_UNICODE); - CHECK_VAL(notify.notify.out.changes[3].action, NOTIFY_ACTION_REMOVED); - CHECK_WSTR(notify.notify.out.changes[3].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.num_changes, 4); + CHECK_VAL(notify.out.changes[0].action, NOTIFY_ACTION_ADDED); + CHECK_WSTR(notify.out.changes[0].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.changes[1].action, NOTIFY_ACTION_REMOVED); + CHECK_WSTR(notify.out.changes[1].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.changes[2].action, NOTIFY_ACTION_ADDED); + CHECK_WSTR(notify.out.changes[2].name, "subdir-name", STR_UNICODE); + CHECK_VAL(notify.out.changes[3].action, NOTIFY_ACTION_REMOVED); + CHECK_WSTR(notify.out.changes[3].name, "subdir-name", STR_UNICODE); count = torture_numops; printf("testing buffered notify on create of %d files\n", count); @@ -164,12 +164,12 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) /* (1st notify) setup a new notify on a different directory handle. This new notify won't see the events above. */ - notify.notify.in.file.fnum = fnum2; + notify.in.file.fnum = fnum2; req2 = smb_raw_changenotify_send(cli->tree, ¬ify); /* (2nd notify) whereas this notify will see the above buffered events, and it directly returns the buffered events */ - notify.notify.in.file.fnum = fnum; + notify.in.file.fnum = fnum; req = smb_raw_changenotify_send(cli->tree, ¬ify); /* (1st unlink) as the 2nd notify directly returns, @@ -183,18 +183,18 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, count); - for (i=1;itree, ¬ify); @@ -207,26 +207,26 @@ static BOOL test_notify_dir(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) /* recev the 3rd notify */ status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, 1); - CHECK_VAL(notify.notify.out.changes[0].action, NOTIFY_ACTION_REMOVED); - CHECK_WSTR(notify.notify.out.changes[0].name, "test0.txt", STR_UNICODE); + CHECK_VAL(notify.out.num_changes, 1); + CHECK_VAL(notify.out.changes[0].action, NOTIFY_ACTION_REMOVED); + CHECK_WSTR(notify.out.changes[0].name, "test0.txt", STR_UNICODE); /* and we now see the rest of the unlink calls on both directory handles */ - notify.notify.in.file.fnum = fnum; + notify.in.file.fnum = fnum; req = smb_raw_changenotify_send(cli->tree, ¬ify); status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, count-1); - for (i=0;itree, ¬ify); status = smb_raw_changenotify_recv(req, mem_ctx, ¬ify); CHECK_STATUS(status, NT_STATUS_OK); - CHECK_VAL(notify.notify.out.num_changes, count-1); - for (i=0;i