Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / ntfs / upcase.c

diff --git a/fs/ntfs/upcase.c b/fs/ntfs/upcase.c
index 4478983..9101807 100644 (file)
--- a/fs/ntfs/upcase.c
+++ b/fs/ntfs/upcase.c
@@ -3,10 +3,7 @@
  *           Part of the Linux-NTFS project.
  *
  * Copyright (c) 2001 Richard Russon <ntfs@flatcap.org>
- * Copyright (c) 2001-2003 Anton Altaparmakov
- *
- * Modified for mkntfs inclusion 9 June 2001 by Anton Altaparmakov.
- * Modified for kernel inclusion 10 September 2001 by Anton Altparmakov.
+ * Copyright (c) 2001-2006 Anton Altaparmakov
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -24,9 +21,10 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "malloc.h"
 #include "ntfs.h"
 
-uchar_t *generate_default_upcase(void)
+ntfschar *generate_default_upcase(void)
 {
        static const int uc_run_table[][3] = { /* Start, End, Add */
        {0x0061, 0x007B,  -32}, {0x0451, 0x045D, -80}, {0x1F70, 0x1F72,  74},
@@ -68,18 +66,19 @@ uchar_t *generate_default_upcase(void)
        };
 
        int i, r;
-       uchar_t *uc;
+       ntfschar *uc;
 
-       uc = ntfs_malloc_nofs(default_upcase_len * sizeof(uchar_t));
+       uc = ntfs_malloc_nofs(default_upcase_len * sizeof(ntfschar));
        if (!uc)
                return uc;
-       memset(uc, 0, default_upcase_len * sizeof(uchar_t));
+       memset(uc, 0, default_upcase_len * sizeof(ntfschar));
+       /* Generate the little endian Unicode upcase table used by ntfs. */
        for (i = 0; i < default_upcase_len; i++)
                uc[i] = cpu_to_le16(i);
        for (r = 0; uc_run_table[r][0]; r++)
                for (i = uc_run_table[r][0]; i < uc_run_table[r][1]; i++)
-                       uc[i] = cpu_to_le16((le16_to_cpu(uc[i]) +
-                                       uc_run_table[r][2]));
+                       uc[i] = cpu_to_le16(le16_to_cpu(uc[i]) +
+                                       uc_run_table[r][2]);
        for (r = 0; uc_dup_table[r][0]; r++)
                for (i = uc_dup_table[r][0]; i < uc_dup_table[r][1]; i += 2)
                        uc[i + 1] = cpu_to_le16(le16_to_cpu(uc[i + 1]) - 1);
@@ -87,4 +86,3 @@ uchar_t *generate_default_upcase(void)
                uc[uc_word_table[r][0]] = cpu_to_le16(uc_word_table[r][1]);
        return uc;
 }
-