diff options
| author | Jeff Layton <jlayton@redhat.com> | 2009-05-02 04:59:34 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-05-02 04:59:34 +0000 |
| commit | 341060273232a2df0d1a7fa53abc661fcf22747c (patch) | |
| tree | 60af81806205be40f3f60773b98bebc33ce97153 | |
| parent | 2edd6c5b0517b9131ede9e74cb121898ccd73042 (diff) | |
| download | op-kernel-dev-341060273232a2df0d1a7fa53abc661fcf22747c.zip op-kernel-dev-341060273232a2df0d1a7fa53abc661fcf22747c.tar.gz | |
[CIFS] remove cifs_strfromUCS_le
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifs_unicode.c | 29 | ||||
| -rw-r--r-- | 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 6382720..60e3c42 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -181,35 +181,6 @@ cifs_from_ucs2(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 1570a70..6506382 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -76,7 +76,6 @@ int cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen, const struct nls_table *codepage, bool mapchar); int cifs_ucs2_bytes(const __le16 *from, int maxbytes, const struct nls_table *codepage); -int cifs_strfromUCS_le(char *, const __le16 *, int, const struct nls_table *); int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); char *cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode, |
