diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 12:59:58 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 12:59:58 +0100 |
| commit | 9f6e2d64852026d118c717d80236177fd74331eb (patch) | |
| tree | ea16393c0cfc10196f7ee2f0822d5760f4b5a42b /lib/util | |
| parent | 9ffb6d2d9e78ed192b8215194b6328d03d1ddad3 (diff) | |
| download | samba-9f6e2d64852026d118c717d80236177fd74331eb.tar.gz samba-9f6e2d64852026d118c717d80236177fd74331eb.tar.bz2 samba-9f6e2d64852026d118c717d80236177fd74331eb.zip | |
Sync smb_iconv_t type, convert_string return type with Samba 3 equivalents.
Diffstat (limited to 'lib/util')
| -rw-r--r-- | lib/util/charset/charset.h | 3 | ||||
| -rw-r--r-- | lib/util/charset/util_unistr.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 82484b7805..3acdde30ad 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -61,6 +61,7 @@ typedef struct smb_iconv_s { size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); void *cd_direct, *cd_pull, *cd_push; + char *from_name, *to_name; } *smb_iconv_t; /* string manipulation flags */ @@ -119,7 +120,7 @@ ssize_t convert_string_talloc(TALLOC_CTX *ctx, void const *src, size_t srclen, void **dest, bool allow_badcharcnv); -ssize_t convert_string(charset_t from, charset_t to, +size_t convert_string(charset_t from, charset_t to, void const *src, size_t srclen, void *dest, size_t destlen, bool allow_badcharcnv); diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c index e6c6c3f466..96c987393f 100644 --- a/lib/util/charset/util_unistr.c +++ b/lib/util/charset/util_unistr.c @@ -950,7 +950,7 @@ _PUBLIC_ ssize_t pull_string(char *dest, const void *src, size_t dest_len, size_ * @param destlen maximal length allowed for string * @returns the number of bytes occupied in the destination **/ -_PUBLIC_ ssize_t convert_string(charset_t from, charset_t to, +_PUBLIC_ size_t convert_string(charset_t from, charset_t to, void const *src, size_t srclen, void *dest, size_t destlen, bool allow_badcharcnv) { |