diff options
| author | Gerald Carter <jerry@samba.org> | 2002-09-25 15:19:00 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-09-25 15:19:00 +0000 |
| commit | 65e7b5273bb58802bf0c389b77f7fcae0a1f6139 (patch) | |
| tree | 672f59370f72efa2b3f4471bf311e0159e004a13 /source/lib/charcnv.c | |
| parent | b5d03c7b55fb2f34fa4d0228abe4389020e5ed5f (diff) | |
| download | samba-65e7b5273bb58802bf0c389b77f7fcae0a1f6139.tar.gz | |
sync'ing up for 3.0alpha20 release
Diffstat (limited to 'source/lib/charcnv.c')
| -rw-r--r-- | source/lib/charcnv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c index 6e961366435..cd8aa4fe55f 100644 --- a/source/lib/charcnv.c +++ b/source/lib/charcnv.c @@ -432,13 +432,14 @@ int push_ucs2(const void *base_ptr, void *dest, const char *src, int dest_len, i * @param dest always set at least to NULL * * @retval The number of bytes occupied by the string in the destination + * or -1 in case of error. **/ -int push_ucs2_talloc(TALLOC_CTX *ctx, void **dest, const char *src) +int push_ucs2_talloc(TALLOC_CTX *ctx, smb_ucs2_t **dest, const char *src) { int src_len = strlen(src)+1; *dest = NULL; - return convert_string_talloc(ctx, CH_UNIX, CH_UCS2, src, src_len, dest); + return convert_string_talloc(ctx, CH_UNIX, CH_UCS2, src, src_len, (void **)dest); } /** @@ -447,13 +448,14 @@ int push_ucs2_talloc(TALLOC_CTX *ctx, void **dest, const char *src) * @param dest always set at least to NULL * * @retval The number of bytes occupied by the string in the destination + * or -1 in case of error. **/ -int push_ucs2_allocate(void **dest, const char *src) +int push_ucs2_allocate(smb_ucs2_t **dest, const char *src) { int src_len = strlen(src)+1; *dest = NULL; - return convert_string_allocate(CH_UNIX, CH_UCS2, src, src_len, dest); + return convert_string_allocate(CH_UNIX, CH_UCS2, src, src_len, (void **)dest); } /**************************************************************************** |