diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-07-22 07:38:32 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-07-22 07:38:32 +0000 |
| commit | 594f84b4e39182dcf344c02dc0185376a2726395 (patch) | |
| tree | b53e642d8af62c16c13ab9478ebea1dc77ee9d86 /source/include/smb.h | |
| parent | e236a3e29e4af24b20ec6af357ce67abf82b4528 (diff) | |
| download | samba-594f84b4e39182dcf344c02dc0185376a2726395.tar.gz samba-594f84b4e39182dcf344c02dc0185376a2726395.tar.xz samba-594f84b4e39182dcf344c02dc0185376a2726395.zip | |
changed the iconv interface to go via ucs2 for all conversions. This
fixes some problems wih some character sets and allows for using
internal charsets in conjunction with ionv charsets
this makes us slower but more correct. speed will come later.
Diffstat (limited to 'source/include/smb.h')
| -rw-r--r-- | source/include/smb.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/include/smb.h b/source/include/smb.h index 091ed2ac663..2e83e1c6375 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -1687,15 +1687,13 @@ typedef struct { /* generic iconv conversion structure */ typedef struct { - size_t (*direct)(char **inbuf, size_t *inbytesleft, + size_t (*direct)(void *cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - size_t (*pull)(char **inbuf, size_t *inbytesleft, + size_t (*pull)(void *cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - size_t (*push)(char **inbuf, size_t *inbytesleft, + size_t (*push)(void *cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); -#ifdef HAVE_NATIVE_ICONV - iconv_t cd; -#endif + void *cd_direct, *cd_pull, *cd_push; } *smb_iconv_t; #endif /* _SMB_H */ |