From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sun, 28 Aug 2011 09:05:46 +0000 (+1000)
Subject: nfs.x: some rpcgen's can not handle multiple union choices for the same arm.
X-Git-Tag: upstream/1.9.6^2~326^2~14
X-Git-Url: https://git.piment-noir.org/?p=deb_libnfs.git;a=commitdiff_plain;h=cd033209559c196f887b4b524de845f323736024

nfs.x: some rpcgen's can not handle multiple union choices for the same arm.
Make sure each choice has a dedicated arm
---

diff --git a/nfs/nfs.x b/nfs/nfs.x
index 026abe5..1f4976b 100644
--- a/nfs/nfs.x
+++ b/nfs/nfs.x
@@ -333,8 +333,9 @@ typedef opaque createverf3[NFS3_CREATEVERFSIZE];
 
 union createhow3 switch (createmode3 mode) {
 	case UNCHECKED:
-	case GUARDED:
 		sattr3       obj_attributes;
+	case GUARDED:
+		sattr3       g_obj_attributes;
 	case EXCLUSIVE:
 		createverf3  verf;
 };
@@ -556,9 +557,11 @@ struct devicedata3 {
 
 union mknoddata3 switch (ftype3 type) {
 	case NF3CHR:
+		devicedata3  chr_device;
 	case NF3BLK:
-		devicedata3  device;
+		devicedata3  blk_device;
 	case NF3SOCK:
+		sattr3       sock_attributes;
 	case NF3FIFO:
 		sattr3       pipe_attributes;
 	default: