diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:26:46 +0200 |
commit | 37d885c51a559d2be7dd15f46a80027e4f1dffef (patch) | |
tree | 5e6fd2f9fb3463f8694ee9b6b022d0878737e0e6 /source4/lib/registry/util.c | |
parent | 284f523ec70477c408887a478e8392671f12dfff (diff) | |
download | samba-37d885c51a559d2be7dd15f46a80027e4f1dffef.tar.gz |
Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
Diffstat (limited to 'source4/lib/registry/util.c')
-rw-r--r-- | source4/lib/registry/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c index b3b6e49ea5e..471c4250027 100644 --- a/source4/lib/registry/util.c +++ b/source4/lib/registry/util.c @@ -64,7 +64,7 @@ _PUBLIC_ char *reg_val_data_string(TALLOC_CTX *mem_ctx, switch (type) { case REG_EXPAND_SZ: case REG_SZ: - convert_string_talloc(mem_ctx, iconv_convenience, CH_UTF16, CH_UNIX, + convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UTF16, CH_UNIX, data.data, data.length, (void **)&ret); return ret; @@ -124,7 +124,7 @@ _PUBLIC_ bool reg_string_to_val(TALLOC_CTX *mem_ctx, { case REG_SZ: case REG_EXPAND_SZ: - data->length = convert_string_talloc(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16, + data->length = convert_string_talloc_convenience(mem_ctx, iconv_convenience, CH_UNIX, CH_UTF16, data_str, strlen(data_str), (void **)&data->data); break; |