r6232: more cleanups; remove BUFFER3; rename BUFFER4 -> RPC_DATA_BLOB; rename REG_CREATE_VALE -> REG_SET_VALUE

(This used to be commit 28d433351cf813c7fb57ebac0e0f4973c85f73e8)

1 files changed, 11 insertions, 31 deletions

diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index e93d6610ba8..dcc0ecc554a 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -147,20 +147,12 @@ typedef struct {
 
 
 /********************************************************************** 
- * Buffers use by winreg
+ * Buffers 
  **********************************************************************/
 
-/* 
-   OLD COMMENT: 
-      BUFFER2 - unicode string, size (in uint8 ascii chars) and buffer 
-      pathetic.  some stupid team of \PIPE\winreg writers got the concept
-      of a unicode string different from the other \PIPE\ writers
-
-   NEW COMMENT: 
-      buffer used by \winreg\ calls to fill in arbitrary REG_XXX values.
-      It *may* look like a UNISTR2 but it is *not*.  This is not a goof
-      by the winreg developers.  It is a generic buffer 
-*/
+/* buffer used by \winreg\ calls to fill in arbitrary REG_XXX values.
+   It *may* look like a UNISTR2 but it is *not*.  This is not a goof
+   by the winreg developers.  It is a generic buffer */
 
 typedef struct {
 	uint32 buf_max_len;
@@ -169,34 +161,22 @@ typedef struct {
 	uint16 *buffer;
 } REGVAL_BUFFER;
 
-typedef struct buffer3_info {
-	uint32 buf_max_len;
-	uint8  *buffer; 		/* Data */
-	uint32 buf_len;
-} BUFFER3;
-
-
-
-/********************************************************************** 
- * Buffers use by spoolss
- **********************************************************************/
+/* generic rpc version of the DATA_BLOB.  Just a length and uint8 array */
 
 typedef struct {
 	uint32 buf_len;
-	uint16 *buffer; /* data */
-} BUFFER5;
-
-
+	uint8 *buffer;
+} RPC_DATA_BLOB;
 
 /********************************************************************** 
- * Buffers use by netlogon
+ * Buffers use by spoolss (i might be able to replace it with
+ * an RPC_DATA_BLOB)
  **********************************************************************/
 
 typedef struct {
 	uint32 buf_len;
-	uint8 *buffer;
-} BUFFER4;
-
+	uint16 *buffer; /* data */
+} BUFFER5;
 
 
 /**********************************************************************