Imported Upstream version 1.2.4

[sven/exfat-utils.git] / libexfat / lookup.c

diff --git a/libexfat/lookup.c b/libexfat/lookup.c
index 2e1aa81844c98fa0a51c02475c5567791a98c15a..30b64108df127d8b112de346fa019cf1e51b36d7 100644 (file)
--- a/libexfat/lookup.c
+++ b/libexfat/lookup.c
@@ -2,11 +2,12 @@
        lookup.c (02.09.09)
        exFAT file system implementation library.
 
        lookup.c (02.09.09)
        exFAT file system implementation library.
 

-       Copyright (C) 2010-2013  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2010-2016  Andrew Nayenko

 
 

-       This program is free software: you can redistribute it and/or modify
+       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
        it under the terms of the GNU General Public License as published by

-       the Free Software Foundation, either version 3 of the License, or
+       the Free Software Foundation, either version 2 of the License, or

        (at your option) any later version.
 
        This program is distributed in the hope that it will be useful,
        (at your option) any later version.
 
        This program is distributed in the hope that it will be useful,


@@ -14,8 +15,9 @@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
 
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
 

-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 */
 
 #include "exfat.h"
 */
 
 #include "exfat.h"


@@ -59,10 +61,7 @@ struct exfat_node* exfat_readdir(struct exfat* ef, struct exfat_iterator* it)
 
 static int compare_char(struct exfat* ef, uint16_t a, uint16_t b)
 {
 
 static int compare_char(struct exfat* ef, uint16_t a, uint16_t b)
 {

-       if (a >= ef->upcase_chars || b >= ef->upcase_chars)
-               return (int) a - (int) b;
-
-       return (int) le16_to_cpu(ef->upcase[a]) - (int) le16_to_cpu(ef->upcase[b]);
+       return (int) ef->upcase[a] - (int) ef->upcase[b];

 }
 
 static int compare_name(struct exfat* ef, const le16_t* a, const le16_t* b)
 }
 
 static int compare_name(struct exfat* ef, const le16_t* a, const le16_t* b)