r20566: Prepending with r-> is no longer necessary.

(This used to be commit 1df96af3103795f609165e7a7344e1bf6046be79)

6 files changed, 18 insertions, 18 deletions

diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index f3e6c06182..759c532f08 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -159,7 +159,7 @@ interface drsblobs {
 		NTTIME time;
 		uint32 u2;
 		uint32 u3;
-		[value(ndr_size_ldapControlDirSyncExtra(&r->extra, r->extra.data.uptodateness_vector.count, 0))] 
+		[value(ndr_size_ldapControlDirSyncExtra(&extra, extra.data.uptodateness_vector.count, 0))] 
 			uint32 extra_length;
 		drsuapi_DsReplicaHighWaterMark highwatermark;
 		GUID guid1;
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index e815de1cca..5974506e60 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -127,7 +127,7 @@ interface drsuapi
 	/* Function 0x02 */
 	typedef [public,gensize] struct {
 		[value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->flags)-4)] uint32 __ndr_size;
-		[value(ndr_size_dom_sid28(&r->sid, ndr->flags))]  uint32 __ndr_size_sid;
+		[value(ndr_size_dom_sid28(&sid, ndr->flags))]  uint32 __ndr_size_sid;
 		GUID guid;
 		dom_sid28 sid;
 		[flag(STR_SIZE4|STR_CHARLEN|STR_CONFORMANT)] string dn;
@@ -327,7 +327,7 @@ interface drsuapi
 	 * 2.5.5.17	=> dom_sid
 	 */
 	typedef [nopush,nopull] struct {
-		[range(0,10000),value(ndr_size_drsuapi_DsReplicaOID_oid(r->oid, 0))] uint32 __ndr_size;
+		[range(0,10000),value(ndr_size_drsuapi_DsReplicaOID_oid(oid, 0))] uint32 __ndr_size;
 		[size_is(__ndr_size),charset(DOS)] uint8 *oid; /* it's encoded with asn1_write_OID_String() */
 	} drsuapi_DsReplicaOID;
 
@@ -436,7 +436,7 @@ interface drsuapi
 
 	/* Generic DATA_BLOB values */
 	typedef struct {
-		[range(0,10485760),value(ndr_size_DATA_BLOB(0,r->blob,0))] uint32 __ndr_size;
+		[range(0,10485760),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 __ndr_size;
 		DATA_BLOB *blob;
 	} drsuapi_DsAttributeValue;
 
@@ -448,7 +448,7 @@ interface drsuapi
 	/* DN String values */
 	typedef [public,gensize] struct {
 		[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags))] uint32 __ndr_size;
-		[value(ndr_size_dom_sid28(&r->sid,ndr->flags))]  uint32 __ndr_size_sid;
+		[value(ndr_size_dom_sid28(&sid,ndr->flags))]  uint32 __ndr_size_sid;
 		GUID guid;
 		dom_sid28 sid;
 		[flag(STR_SIZE4|STR_CHARLEN)] string dn;
@@ -456,11 +456,11 @@ interface drsuapi
 
 	typedef [public,gensize] struct {
 		[value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary(r, ndr->flags))] uint32 __ndr_size;
-		[value(ndr_size_dom_sid28(&r->sid,ndr->flags))]  uint32 __ndr_size_sid;
+		[value(ndr_size_dom_sid28(&sid,ndr->flags))]  uint32 __ndr_size_sid;
 		GUID guid;
 		dom_sid28 sid;
 		[flag(STR_SIZE4|STR_CHARLEN)] string dn;
-		[value(r->binary.length + 4)] uint32 __ndr_size_binary;
+		[value(binary.length + 4)] uint32 __ndr_size_binary;
 		[flag(NDR_REMAINING)] DATA_BLOB binary;
 	} drsuapi_DsReplicaObjectIdentifier3Binary;
 
@@ -557,7 +557,7 @@ interface drsuapi
 	typedef struct {
 		uint32 decompressed_length;
 		uint32 compressed_length;
-		[subcontext(4),subcontext_size(r->compressed_length),
+		[subcontext(4),subcontext_size(compressed_length),
 		 compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
 		 drsuapi_DsGetNCChangesCtr1 *ctr1;
 	} drsuapi_DsGetNCChangesMSZIPCtr1;
@@ -565,7 +565,7 @@ interface drsuapi
 	typedef struct {
 		uint32 decompressed_length;
 		uint32 compressed_length;
-		[subcontext(4),subcontext_size(r->compressed_length),
+		[subcontext(4),subcontext_size(compressed_length),
 		 compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
 		 drsuapi_DsGetNCChangesCtr6 *ctr6;
 	} drsuapi_DsGetNCChangesMSZIPCtr6;
@@ -573,7 +573,7 @@ interface drsuapi
 	typedef struct {
 		uint32 decompressed_length;
 		uint32 compressed_length;
-		[subcontext(4),subcontext_size(r->compressed_length),
+		[subcontext(4),subcontext_size(compressed_length),
 		 compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length),
 		 flag(NDR_REMAINING)] DATA_BLOB *decompressed;
 	} drsuapi_DsGetNCChangesXPRESSCtr1;
@@ -581,7 +581,7 @@ interface drsuapi
 	typedef struct {
 		uint32 decompressed_length;
 		uint32 compressed_length;
-		[subcontext(4),subcontext_size(r->compressed_length),
+		[subcontext(4),subcontext_size(compressed_length),
 		 compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length),
 		 flag(NDR_REMAINING)] DATA_BLOB *decompressed;
 	} drsuapi_DsGetNCChangesXPRESSCtr6;
@@ -1270,7 +1270,7 @@ interface drsuapi
 	typedef struct {
 		[charset(UTF16),string] uint16 *attribute_name;
 		[charset(UTF16),string] uint16 *object_dn;
-		[value(ndr_size_DATA_BLOB(0,r->binary,0))] uint32 __ndr_size_binary;
+		[value(ndr_size_DATA_BLOB(0,binary,0))] uint32 __ndr_size_binary;
 		DATA_BLOB *binary;
 		NTTIME deleted;
 		NTTIME created;
@@ -1325,7 +1325,7 @@ interface drsuapi
 	typedef struct {
 		[charset(UTF16),string] uint16 *attribute_name;
 		[charset(UTF16),string] uint16 *object_dn;
-		[value(ndr_size_DATA_BLOB(0,r->binary,0))] uint32 __ndr_size_binary;
+		[value(ndr_size_DATA_BLOB(0,binary,0))] uint32 __ndr_size_binary;
 		DATA_BLOB *binary;
 		NTTIME deleted;
 		NTTIME created;
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index 8920869c87..dcab33bcf5 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -199,7 +199,7 @@ interface epmapper
 
 	typedef struct {
 		[subcontext(2)] epm_lhs lhs;
-		[subcontext(2),switch_is(r->lhs.protocol)] epm_rhs rhs;
+		[subcontext(2),switch_is(lhs.protocol)] epm_rhs rhs;
 	} epm_floor;
 
 	/* note that the NDR_NOALIGN flag is inherited by all nested
diff --git a/source4/librpc/idl/initshutdown.idl b/source4/librpc/idl/initshutdown.idl
index 50d49637c2..868e48e28a 100644
--- a/source4/librpc/idl/initshutdown.idl
+++ b/source4/librpc/idl/initshutdown.idl
@@ -18,8 +18,8 @@
 	} initshutdown_String_sub;
 
 	typedef [public] struct {
-		[value(strlen_m(r->name->name)*2)] uint16 name_len;
-		[value(strlen_m_term(r->name->name)*2)] uint16 name_size;
+		[value(strlen_m(name->name)*2)] uint16 name_len;
+		[value(strlen_m_term(name->name)*2)] uint16 name_size;
 		initshutdown_String_sub *name;
 	} initshutdown_String;
 
diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl
index da25f3e92a..2a30d69cc3 100644
--- a/source4/librpc/idl/krb5pac.idl
+++ b/source4/librpc/idl/krb5pac.idl
@@ -72,7 +72,7 @@ interface krb5pac
 	typedef [public] struct {
 		PAC_TYPE type;
 		uint32 ndr_size;
-		[relative,subcontext(0),subcontext_size(NDR_ROUND(r->ndr_size,8)),flag(NDR_ALIGN8)] DATA_BLOB_REM *info;
+		[relative,subcontext(0),subcontext_size(NDR_ROUND(ndr_size,8)),flag(NDR_ALIGN8)] DATA_BLOB_REM *info;
 		[value(0)] uint32 _pad; /* Top half of a 64 bit pointer? */
 	} PAC_BUFFER_RAW;
 
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index 0860df4ad9..b45f837a02 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -269,7 +269,7 @@ interface nbt
 		uint16                      opcode;
 		uint16                      priority;
 		uint16                      class;
-		[value(strlen(mailslot_name)+1+r->data.length)] 
+		[value(strlen(mailslot_name)+1+data.length)] 
 		      uint16                byte_count;
 		astring                     mailslot_name;
 		[flag(NDR_REMAINING)]       DATA_BLOB data;