diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-19 12:20:11 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-14 12:53:56 +1000 |
| commit | 3b3e21bd9ba701a97e752205263a7903619541c7 (patch) | |
| tree | 3f0cdf8e4d5a550a323e73d229083d6329b3f236 /source3/libsmb/clifile.c | |
| parent | 4786a493f70070dce6de4cbe488c9de1bdbb75ad (diff) | |
| download | samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.gz samba-3b3e21bd9ba701a97e752205263a7903619541c7.tar.bz2 samba-3b3e21bd9ba701a97e752205263a7903619541c7.zip | |
Convert Samba3 to use the common lib/util/charset API
This removes calls to push_*_allocate() and pull_*_allocate(), as well
as convert_string_allocate, as they are not in the common API
To allow transition to a common charcnv in future, provide Samba4-like
strupper functions in source3/lib/charcnv.c
(the actual implementation remains distinct, but the API is now shared)
Andrew Bartlett
Diffstat (limited to 'source3/libsmb/clifile.c')
| -rw-r--r-- | source3/libsmb/clifile.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c index 4293828214..0a1168fd0f 100644 --- a/source3/libsmb/clifile.c +++ b/source3/libsmb/clifile.c @@ -968,10 +968,10 @@ uint8_t *smb_bytes_push_str(uint8_t *buf, bool ucs2, buflen += 1; } - if (!convert_string_allocate(talloc_tos(), CH_UNIX, - ucs2 ? CH_UTF16LE : CH_DOS, - str, str_len, &converted, - &converted_size, true)) { + if (!convert_string_talloc(talloc_tos(), CH_UNIX, + ucs2 ? CH_UTF16LE : CH_DOS, + str, str_len, &converted, + &converted_size, true)) { return NULL; } |