r14539: get rid of a pointless union layer in struct smb_notify

(This used to be commit 1e1c5593817e84c59c1a10b5a3c1957e363e5198)

1 files changed, 25 insertions, 25 deletions

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 6a97f24ba5..80b09ee6be 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -84,7 +84,7 @@ static struct {
 static struct {
 	int notify_count;
 	NTSTATUS status;
-	union smb_notify notify;
+	struct smb_notify notify;
 } notifies[NSERVERS][NINSTANCES];
 
 /* info relevant to the current operation */
@@ -680,7 +680,7 @@ static struct ea_struct gen_ea_struct(void)
 */
 static void async_notify(struct smbcli_request *req)
 {
-	union smb_notify notify;
+	struct smb_notify notify;
 	NTSTATUS status;
 	int i, j;
 	uint16_t tid;
@@ -692,9 +692,9 @@ static void async_notify(struct smbcli_request *req)
 	if (NT_STATUS_IS_OK(status)) {
 		printf("notify tid=%d num_changes=%d action=%d name=%s\n", 
 		       tid, 
-		       notify.notify.out.num_changes,
-		       notify.notify.out.changes[0].action,
-		       notify.notify.out.changes[0].name.s);
+		       notify.out.num_changes,
+		       notify.out.changes[0].action,
+		       notify.out.changes[0].name.s);
 	}
 
 	for (i=0;i<NSERVERS;i++) {
@@ -892,7 +892,7 @@ again:
 	for (j=0;j<NINSTANCES;j++) {
 		for (i=1;i<NSERVERS;i++) {
 			int n;
-			union smb_notify not1, not2;
+			struct smb_notify not1, not2;
 
 			if (notifies[0][j].notify_count != notifies[i][j].notify_count) {
 				if (tries++ < 10) goto again;
@@ -919,26 +919,26 @@ again:
 			not1 = notifies[0][j].notify;
 			not2 = notifies[i][j].notify;
 
-			for (n=0;n<not1.notify.out.num_changes;n++) {
-				if (not1.notify.out.changes[n].action != 
-				    not2.notify.out.changes[n].action) {
+			for (n=0;n<not1.out.num_changes;n++) {
+				if (not1.out.changes[n].action != 
+				    not2.out.changes[n].action) {
 					printf("Notify action %d inconsistent %d %d\n", n,
-					       not1.notify.out.changes[n].action,
-					       not2.notify.out.changes[n].action);
+					       not1.out.changes[n].action,
+					       not2.out.changes[n].action);
 					return False;
 				}
-				if (strcmp(not1.notify.out.changes[n].name.s,
-					   not2.notify.out.changes[n].name.s)) {
+				if (strcmp(not1.out.changes[n].name.s,
+					   not2.out.changes[n].name.s)) {
 					printf("Notify name %d inconsistent %s %s\n", n,
-					       not1.notify.out.changes[n].name.s,
-					       not2.notify.out.changes[n].name.s);
+					       not1.out.changes[n].name.s,
+					       not2.out.changes[n].name.s);
 					return False;
 				}
-				if (not1.notify.out.changes[n].name.private_length !=
-				    not2.notify.out.changes[n].name.private_length) {
+				if (not1.out.changes[n].name.private_length !=
+				    not2.out.changes[n].name.private_length) {
 					printf("Notify name length %d inconsistent %d %d\n", n,
-					       not1.notify.out.changes[n].name.private_length,
-					       not2.notify.out.changes[n].name.private_length);
+					       not1.out.changes[n].name.private_length,
+					       not2.out.changes[n].name.private_length);
 					return False;
 				}
 			}
@@ -1820,16 +1820,16 @@ static BOOL handler_sfileinfo(int instance)
 */
 static BOOL handler_notify(int instance)
 {
-	union smb_notify parm[NSERVERS];
+	struct smb_notify parm[NSERVERS];
 	int n;
 
-	parm[0].notify.in.buffer_size = gen_io_count();
-	parm[0].notify.in.completion_filter = gen_bits_mask(0xFF);
-	parm[0].notify.in.file.fnum = gen_fnum(instance);
-	parm[0].notify.in.recursive = gen_bool();
+	parm[0].in.buffer_size = gen_io_count();
+	parm[0].in.completion_filter = gen_bits_mask(0xFF);
+	parm[0].in.file.fnum = gen_fnum(instance);
+	parm[0].in.recursive = gen_bool();
 
 	GEN_COPY_PARM;
-	GEN_SET_FNUM(notify.in.file.fnum);
+	GEN_SET_FNUM(in.file.fnum);
 
 	for (n=0;n<NSERVERS;n++) {
 		struct smbcli_request *req;