diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
| commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
| tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /libcli/registry/util_reg.c | |
| parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
| download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.xz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip | |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'libcli/registry/util_reg.c')
| -rw-r--r-- | libcli/registry/util_reg.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libcli/registry/util_reg.c b/libcli/registry/util_reg.c index 6ab2be0a11..3a1168f615 100644 --- a/libcli/registry/util_reg.c +++ b/libcli/registry/util_reg.c @@ -75,13 +75,12 @@ _PUBLIC_ int regtype_by_string(const char *str) push a string in unix charset into a REG_SZ UCS2 null terminated blob ********************************************************************/ -bool push_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - DATA_BLOB *blob, const char *s) +bool push_reg_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char *s) { union winreg_Data data; enum ndr_err_code ndr_err; data.string = s; - ndr_err = ndr_push_union_blob(blob, mem_ctx, ic, &data, REG_SZ, + ndr_err = ndr_push_union_blob(blob, mem_ctx, &data, REG_SZ, (ndr_push_flags_fn_t)ndr_push_winreg_Data); return NDR_ERR_CODE_IS_SUCCESS(ndr_err); } @@ -91,13 +90,12 @@ bool push_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, terminated blob ********************************************************************/ -bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - DATA_BLOB *blob, const char **a) +bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, const char **a) { union winreg_Data data; enum ndr_err_code ndr_err; data.string_array = a; - ndr_err = ndr_push_union_blob(blob, mem_ctx, ic, &data, REG_MULTI_SZ, + ndr_err = ndr_push_union_blob(blob, mem_ctx, &data, REG_MULTI_SZ, (ndr_push_flags_fn_t)ndr_push_winreg_Data); return NDR_ERR_CODE_IS_SUCCESS(ndr_err); } @@ -106,12 +104,11 @@ bool push_reg_multi_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, pull a string in unix charset out of a REG_SZ UCS2 null terminated blob ********************************************************************/ -bool pull_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, - const DATA_BLOB *blob, const char **s) +bool pull_reg_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char **s) { union winreg_Data data; enum ndr_err_code ndr_err; - ndr_err = ndr_pull_union_blob(blob, mem_ctx, ic, &data, REG_SZ, + ndr_err = ndr_pull_union_blob(blob, mem_ctx, &data, REG_SZ, (ndr_pull_flags_fn_t)ndr_pull_winreg_Data); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return false; @@ -125,12 +122,12 @@ bool pull_reg_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, terminated blob ********************************************************************/ -bool pull_reg_multi_sz(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic, +bool pull_reg_multi_sz(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const char ***a) { union winreg_Data data; enum ndr_err_code ndr_err; - ndr_err = ndr_pull_union_blob(blob, mem_ctx, ic, &data, REG_MULTI_SZ, + ndr_err = ndr_pull_union_blob(blob, mem_ctx, &data, REG_MULTI_SZ, (ndr_pull_flags_fn_t)ndr_pull_winreg_Data); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return false; |