[linux-cifs-client,12/12] cifs: remove cifs_strfromUCS_le

Commit Message

Jeff Layton April 30, 2009, 11:42 a.m. UTC

Signed-off-by: Jeff Layton <[e-mail]>
---
 fs/cifs/cifs_unicode.c |   29 -----------------------------
 fs/cifs/cifs_unicode.h |    1 -
 2 files changed, 0 insertions(+), 30 deletions(-)

Patch

diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c
index 2a879cf..cc73a35 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 e620f0b..1068078 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(const char *src, const int maxlen, const bool is_unicode,
 		   const struct nls_table *codepage);