From 2c11b73391551723e4ada8664b1ba77873420217 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Wed, 23 Sep 2009 20:46:08 +0200
Subject: s3-registry: use push_reg_sz().

Guenther
---
 source3/registry/reg_util.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/registry/reg_util.c')

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 714a39f307..3b0885db82 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -221,7 +221,7 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer )
 	int i;
 	size_t buf_size = 0;
 	uint16 *buf, *b;
-	UNISTR2 sz;
+	DATA_BLOB sz;
 
 	if ( !values || !buffer )
 		return 0;
@@ -234,14 +234,14 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer )
 	}
 
 	for ( i=0; values[i]; i++ ) {
-		ZERO_STRUCT( sz );
+
 		/* DEBUG(0,("regval_build_multi_sz: building [%s]\n",values[i])); */
-		init_unistr2( &sz, values[i], UNI_STR_TERMINATE );
+		push_reg_sz(talloc_tos(), &sz, values[i]);
 
 		/* Alloc some more memory.  Always add one one to account for the 
 		   double NULL termination */
 
-		b = TALLOC_REALLOC_ARRAY( NULL, buf, uint16, buf_size+sz.uni_str_len+1 );
+		b = TALLOC_REALLOC_ARRAY( NULL, buf, uint16, buf_size+sz.length/2+1 );
 		if ( !b ) {
 			DEBUG(0,("regval_build_multi_sz: talloc() reallocation error!\n"));
 			TALLOC_FREE( buffer );
@@ -250,12 +250,12 @@ size_t regval_build_multi_sz( char **values, uint16 **buffer )
 		buf = b;
 
 		/* copy the unistring2 buffer and increment the size */
-		/* dump_data(1,sz.buffer,sz.uni_str_len*2); */
-		memcpy( buf+buf_size, sz.buffer, sz.uni_str_len*2 );
-		buf_size += sz.uni_str_len;
+		/* dump_data(1,sz.data,sz.length); */
+		memcpy( buf+buf_size, sz.data, sz.length);
+		buf_size += sz.length;
 
 		/* cleanup rather than leaving memory hanging around */
-		TALLOC_FREE( sz.buffer );
+		TALLOC_FREE( sz.data );
 	}
 
 	buf[buf_size++] = 0x0;
-- 
cgit 


From 2ccf75d9a9e73a05ab5cbe56526aba3bb45011f0 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 25 Sep 2009 00:37:02 +0200
Subject: s3: remove unused regval_build_multi_sz().

Guenther
---
 source3/registry/reg_util.c | 54 ---------------------------------------------
 1 file changed, 54 deletions(-)

(limited to 'source3/registry/reg_util.c')

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 3b0885db82..e468a6244a 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -211,57 +211,3 @@ int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***valu
 
 	return num_strings;
 }
-
-/**********************************************************************
- Returns number of bytes, not number of unicode characters
-*********************************************************************/
-
-size_t regval_build_multi_sz( char **values, uint16 **buffer )
-{
-	int i;
-	size_t buf_size = 0;
-	uint16 *buf, *b;
-	DATA_BLOB sz;
-
-	if ( !values || !buffer )
-		return 0;
-
-	/* go ahead and alloc some space */
-
-	if ( !(buf = TALLOC_ARRAY( NULL, uint16, 2 )) ) {
-		DEBUG(0,("regval_build_multi_sz: talloc() failed!\n"));
-		return 0;
-	}
-
-	for ( i=0; values[i]; i++ ) {
-
-		/* DEBUG(0,("regval_build_multi_sz: building [%s]\n",values[i])); */
-		push_reg_sz(talloc_tos(), &sz, values[i]);
-
-		/* Alloc some more memory.  Always add one one to account for the 
-		   double NULL termination */
-
-		b = TALLOC_REALLOC_ARRAY( NULL, buf, uint16, buf_size+sz.length/2+1 );
-		if ( !b ) {
-			DEBUG(0,("regval_build_multi_sz: talloc() reallocation error!\n"));
-			TALLOC_FREE( buffer );
-			return 0;
-		}
-		buf = b;
-
-		/* copy the unistring2 buffer and increment the size */
-		/* dump_data(1,sz.data,sz.length); */
-		memcpy( buf+buf_size, sz.data, sz.length);
-		buf_size += sz.length;
-
-		/* cleanup rather than leaving memory hanging around */
-		TALLOC_FREE( sz.data );
-	}
-
-	buf[buf_size++] = 0x0;
-
-	*buffer = buf;
-
-	/* return number of bytes */
-	return buf_size*2;
-}
-- 
cgit 


From 26e798da19a9c36fad62e978545c6dfc90a9645d Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Fri, 25 Sep 2009 01:00:24 +0200
Subject: s3: remove unused regval_convert_multi_sz().

Guenther
---
 source3/registry/reg_util.c | 53 ---------------------------------------------
 1 file changed, 53 deletions(-)

(limited to 'source3/registry/reg_util.c')

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index e468a6244a..fd7652116f 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -158,56 +158,3 @@ char *reg_remaining_path(TALLOC_CTX *ctx, const char *key)
 
 	return p;
 }
-
-/**********************************************************************
-*********************************************************************/
-
-int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***values )
-{
-	char **sz;
-	int i;
-	int num_strings = 0;
-	fstring buffer;
-	uint16 *wp;
-	size_t multi_len = byte_len / 2;
-
-	if ( !multi_string || !values )
-		return 0;
-
-	*values = NULL;
-
-	/* just count the NULLs */
-
-	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i++ ) {
-		/* peek ahead */
-		if ( multi_string[i+1] == 0x0 )
-			num_strings++;
-	}
-
-	if ( num_strings == 0 )
-		return 0;
-
-	if ( !(sz = TALLOC_ARRAY( NULL, char*, num_strings+1 )) ) {
-		DEBUG(0,("reg_convert_multi_sz: talloc() failed!\n"));
-		return -1;
-	}
-
-	wp = multi_string;
-
-	for ( i=0; i<num_strings; i++ ) {
-		rpcstr_pull( buffer, wp, sizeof(buffer), -1, STR_TERMINATE );
-		sz[i] = talloc_strdup( sz, buffer );
-
-		/* skip to the next string NULL and then one more */
-		while ( *wp )
-			wp++;
-		wp++;
-	}
-
-	/* tag the array off with an empty string */
-	sz[i] = '\0';
-
-	*values = sz;
-
-	return num_strings;
-}
-- 
cgit