summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-08-04 13:00:40 +0000
committerThomas Martitz <kugel@rockbox.org>2009-08-04 13:00:40 +0000
commit28fbb49c0bfe44142eb36b3891d4d28021a1b277 (patch)
treec50ceaf41820d543272f0ff74a6c19befff75b1f /firmware
parent3c58b261528d9590f7c09e220c57feb152b86ad4 (diff)
downloadrockbox-28fbb49c0bfe44142eb36b3891d4d28021a1b277.tar.gz
rockbox-28fbb49c0bfe44142eb36b3891d4d28021a1b277.tar.bz2
rockbox-28fbb49c0bfe44142eb36b3891d4d28021a1b277.zip
Fix for:
FS#10031 - "improper sorting of names with underscores when Interpret numbers when sorting is used" and FS#10200 - "Incorrect sorting of roman numerals when whole numbers selected" a) By using tolower instead of toupper for case-insensitive sorting b) By not ignoring spaces (which isn't really what we aimed for anyway). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22153 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/common/strnatcmp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/common/strnatcmp.c b/firmware/common/strnatcmp.c
index 04b760e8e7..3c98200f7e 100644
--- a/firmware/common/strnatcmp.c
+++ b/firmware/common/strnatcmp.c
@@ -58,18 +58,18 @@ nat_isdigit(int a)
return isdigit(a);
}
-
+#if 0
static inline int
nat_isspace(int a)
{
return isspace(a);
}
-
+#endif
static inline int
nat_toupper(int a)
{
- return toupper(a);
+ return tolower(a);
}
@@ -139,14 +139,14 @@ static int strnatcmp0(char const *a, char const *b, int fold_case)
while (1) {
ca = to_int(a[ai]);
cb = to_int(b[bi]);
-
+#if 0
/* skip over leading spaces or zeros */
while (nat_isspace(ca))
ca = to_int(a[++ai]);
while (nat_isspace(cb))
cb = to_int(b[++bi]);
-
+#endif
/* process run of digits */
if (nat_isdigit(ca) && nat_isdigit(cb)) {
fractional = (ca == '0' || cb == '0');