diff options
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/registry/reg_util.c | 54 |
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; -} |