[PATCH 12/12] cifs: remove cifs_strfromUCS_le
Jeff Layton <[email protected]>
| Newsgroups | gmane.linux.file-systems.cifs |
|---|---|
| Message-ID | <[email protected]> |
Signed-off-by: Jeff Layton <[email protected]> --- fs/cifs/cifs_unicode.c | 29 ----------------------------- fs/cifs/cifs_unicode.h | 1 - 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index e325d3d..1793434 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -183,35 +183,6 @@ cifs_from_ucs2le(char *to, const __le16 *from, int tolen, int fromlen, } /* - * NAME: cifs_strfromUCS() - * - * FUNCTION: Convert little-endian unicode string to character string - * - */ -int -cifs_strfromUCS_le(char *to, const __le16 *from, - int len, const struct nls_table *codepage) -{ - int i; - int outlen = 0; - - for (i = 0; (i < len) && from[i]; i++) { - int charlen; - /* 2.4.0 kernel or greater */ - charlen = - codepage->uni2char(le16_to_cpu(from[i]), &to[outlen], - NLS_MAX_CHARSET_SIZE); - if (charlen > 0) { - outlen += charlen; - } else { - to[outlen++] = '?'; - } - } - to[outlen] = 0; - return outlen; -} - -/* * NAME: cifs_strtoUCS() * * FUNCTION: Convert character string to unicode string diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 2ec6375..77e25fe 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -76,7 +76,6 @@ int cifs_ucs2le_bytes(const __le16 *from, int maxbytes, const struct nls_table *codepage); int cifs_from_ucs2le(char *to, const __le16 *from, int tolen, int fromlen, const struct nls_table *codepage, bool mapchar); -int cifs_strfromUCS_le(char *, const __le16 *, int, const struct nls_table *); int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); int cifs_strldup_to_host(char **dst, const char *src, const int maxlen, const bool is_unicode, -- 1.6.0.6