summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-09-25 00:37:02 +0200
committerGünther Deschner <gd@samba.org>2009-09-30 00:33:54 +0200
commit2ccf75d9a9e73a05ab5cbe56526aba3bb45011f0 (patch)
tree98b56238b8cdf0c9b65a90ecc51831448f3386aa
parent76bb3808392c981f03deca632dd99081565bf6e1 (diff)
downloadsamba-2ccf75d9a9e73a05ab5cbe56526aba3bb45011f0.tar.gz
samba-2ccf75d9a9e73a05ab5cbe56526aba3bb45011f0.tar.bz2
samba-2ccf75d9a9e73a05ab5cbe56526aba3bb45011f0.zip
s3: remove unused regval_build_multi_sz().
Guenther
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/registry/reg_util.c54
2 files changed, 0 insertions, 55 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d82c202656..5783a5e840 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5159,7 +5159,6 @@ char *normalize_reg_path(TALLOC_CTX *ctx, const char *keyname );
void normalize_dbkey(char *key);
char *reg_remaining_path(TALLOC_CTX *ctx, const char *key);
int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***values );
-size_t regval_build_multi_sz( char **values, uint16 **buffer );
/* The following definitions come from registry/reg_util_legacy.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;
-}