diff options
author | Jeff Layton <jlayton@redhat.com> | 2009-05-02 00:59:34 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2009-05-02 00:59:34 -0400 |
commit | 341060273232a2df0d1a7fa53abc661fcf22747c (patch) | |
tree | 60af81806205be40f3f60773b98bebc33ce97153 | |
parent | 2edd6c5b0517b9131ede9e74cb121898ccd73042 (diff) |
[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 6382720acf7c..60e3c4253de0 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, | |||
181 | } | 181 | } |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * NAME: cifs_strfromUCS() | ||
185 | * | ||
186 | * FUNCTION: Convert little-endian unicode string to character string | ||
187 | * | ||
188 | */ | ||
189 | int | ||
190 | cifs_strfromUCS_le(char *to, const __le16 *from, | ||
191 | int len, const struct nls_table *codepage) | ||
192 | { | ||
193 | int i; | ||
194 | int outlen = 0; | ||
195 | |||
196 | for (i = 0; (i < len) && from[i]; i++) { | ||
197 | int charlen; | ||
198 | /* 2.4.0 kernel or greater */ | ||
199 | charlen = | ||
200 | codepage->uni2char(le16_to_cpu(from[i]), &to[outlen], | ||
201 | NLS_MAX_CHARSET_SIZE); | ||
202 | if (charlen > 0) { | ||
203 | outlen += charlen; | ||
204 | } else { | ||
205 | to[outlen++] = '?'; | ||
206 | } | ||
207 | } | ||
208 | to[outlen] = 0; | ||
209 | return outlen; | ||
210 | } | ||
211 | |||
212 | /* | ||
213 | * NAME: cifs_strtoUCS() | 184 | * NAME: cifs_strtoUCS() |
214 | * | 185 | * |
215 | * FUNCTION: Convert character string to unicode string | 186 | * FUNCTION: Convert character string to unicode string |
diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 1570a701bf3f..650638275a6f 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, | |||
76 | const struct nls_table *codepage, bool mapchar); | 76 | const struct nls_table *codepage, bool mapchar); |
77 | int cifs_ucs2_bytes(const __le16 *from, int maxbytes, | 77 | int cifs_ucs2_bytes(const __le16 *from, int maxbytes, |
78 | const struct nls_table *codepage); | 78 | const struct nls_table *codepage); |
79 | int cifs_strfromUCS_le(char *, const __le16 *, int, const struct nls_table *); | ||
80 | int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); | 79 | int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *); |
81 | char *cifs_strndup_from_ucs(const char *src, const int maxlen, | 80 | char *cifs_strndup_from_ucs(const char *src, const int maxlen, |
82 | const bool is_unicode, | 81 | const bool is_unicode, |