diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-24 09:17:08 +0200 |
| commit | 2ee9ee2c17ce435ce45a773f19302a7b474554c2 (patch) | |
| tree | 2ea91c2d36664f02e001575be0591660190d86ed /lib/util/charset/charcnv.c | |
| parent | b82a204b9b2c28707ab7866a511ea4f5912826ac (diff) | |
| parent | af6316d1500cfcedd5fd59ed0ddbba9aec9c3756 (diff) | |
| download | samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.gz samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.tar.bz2 samba-2ee9ee2c17ce435ce45a773f19302a7b474554c2.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'lib/util/charset/charcnv.c')
| -rw-r--r-- | lib/util/charset/charcnv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c index 94d47a9f7f..a479f44426 100644 --- a/lib/util/charset/charcnv.c +++ b/lib/util/charset/charcnv.c @@ -430,7 +430,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic return the number of bytes occupied by the CH_UNIX character, or -1 on failure */ -_PUBLIC_ ssize_t push_codepoint(struct smb_iconv_convenience *ic, +_PUBLIC_ ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic, char *str, codepoint_t c) { smb_iconv_t descriptor; @@ -478,3 +478,5 @@ _PUBLIC_ ssize_t push_codepoint(struct smb_iconv_convenience *ic, } return 5 - olen; } + + |