diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 19:55:46 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 19:55:46 +0100 |
| commit | 94069bd2747a8397308c0b0b384f7bb4edd8f68b (patch) | |
| tree | ace3c4fa9d0cb134d4e904354bd33b395c1e1289 /source4/lib/registry/util.c | |
| parent | bbe2d30f66ebd8537203870b1225179f03d42744 (diff) | |
| download | samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.tar.gz samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.tar.bz2 samba-94069bd2747a8397308c0b0b384f7bb4edd8f68b.zip | |
s4: Use same function signature for convert_* as s3.
Diffstat (limited to 'source4/lib/registry/util.c')
| -rw-r--r-- | source4/lib/registry/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c index 742c3dca2f..a1897eff2e 100644 --- a/source4/lib/registry/util.c +++ b/source4/lib/registry/util.c @@ -65,7 +65,7 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, case REG_SZ: convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UTF16, CH_UNIX, data.data, data.length, - (void **)&ret, false); + (void **)&ret, NULL, false); return ret; case REG_BINARY: ret = data_blob_hex_string(mem_ctx, &data); @@ -123,9 +123,9 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx, { case REG_SZ: case REG_EXPAND_SZ: - data->length = convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16, + convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16, data_str, strlen(data_str), - (void **)&data->data, false); + (void **)&data->data, &data->length, false); break; case REG_DWORD: { |