From 50d2bf00660c8c2c12cd1ea40b2212aa8250e611 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 27 May 2005 15:49:15 +0000
Subject: r7029: Make array support in pidl similar to that in other IDL
 compilers. We should now able to use constructions like these:

[size_is(20)] int *x; -> Pointer to array of 20 ints
[size_is(20)] int x[]; -> Array of 20 ints
[size_is(20)] int *x[]; -> Array of 20 pointers to ints
[size_is(20,)] int *x[] -> Array of 20 pointers to ints
[size_is(,20)] int *x[]; -> Pointer to array of 20 ints
[size_is(,20)] int **x; -> Pointer to pointer to array of 20 ints
[size_is(20)] int x[][30]; -> 20 blocks of 30 ints
(This used to be commit ecf583da71c2f80be124c17fccdcb284b47e0695)
---
 source4/librpc/idl/samr.idl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/librpc/idl/samr.idl')

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 59de0d1b4a..ba86207109 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -100,7 +100,7 @@
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] samr_SamEntry *entries[];
+		[size_is(count)] samr_SamEntry *entries;
 	} samr_SamArray;
 
 	NTSTATUS samr_EnumDomains (
@@ -311,7 +311,7 @@
 
 	typedef struct {
 		[range(0,1024)]  uint32 count;
-		[size_is(count)] uint32 *ids[];
+		[size_is(count)] uint32 *ids;
 	} samr_Ids;
 
 	NTSTATUS samr_GetAliasMembership(
@@ -432,8 +432,8 @@
 	/* Function    0x19     */
 	typedef struct {
 		uint32 count;
-		[size_is(count)] uint32 *rids[];
-		[size_is(count)] uint32 *types[];
+		[size_is(count)] uint32 *rids;
+		[size_is(count)] uint32 *types;
 	} samr_RidTypeArray;
 
 	NTSTATUS samr_QueryGroupMember(
@@ -565,7 +565,7 @@
 	/* this is also used in samr and netlogon */
 	typedef [public, flag(NDR_PAHEX)] struct {
 		uint16 units_per_week;
-		[size_is(1260), length_is(units_per_week/8)] uint8 *bits[];
+		[size_is(1260), length_is(units_per_week/8)] uint8 *bits;
 	} samr_LogonHours;
 
 	typedef struct {
@@ -703,7 +703,7 @@
 		samr_String unknown2;
 		samr_String unknown3;
 		uint32 buf_count;
-		[size_is(buf_count)] uint8 *buffer[];
+		[size_is(buf_count)] uint8 *buffer;
 		uint32 rid;
 		uint32 primary_gid;
 		samr_AcctFlags acct_flags;
@@ -821,7 +821,7 @@
 
 	typedef [public] struct {
 		uint32     count;
-		[size_is(count)] samr_RidWithType *rids[];
+		[size_is(count)] samr_RidWithType *rids;
 	} samr_RidWithTypeArray;
 
 	NTSTATUS samr_GetGroupsForUser(
@@ -843,7 +843,7 @@
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] samr_DispEntryGeneral *entries[];
+		[size_is(count)] samr_DispEntryGeneral *entries;
 	} samr_DispInfoGeneral;
 
 	typedef struct {
@@ -856,7 +856,7 @@
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] samr_DispEntryFull *entries[];
+		[size_is(count)] samr_DispEntryFull *entries;
 	} samr_DispInfoFull;
 
 	typedef struct {
@@ -872,7 +872,7 @@
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] samr_DispEntryAscii *entries[];
+		[size_is(count)] samr_DispEntryAscii *entries;
 	} samr_DispInfoAscii;
 
 	typedef [switch_type(uint16)] union {
-- 
cgit