From fb13e0d143740ef65690b6a0f91d2d02f859e7e5 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Fri, 21 Oct 2011 20:11:22 +0400 Subject: [PATCH] Ticket #2637: faster startup of mc. Since content of keymap file is ASCII-only and case insensitive, don't use some utf8-manipulation: g_ascii_strcasecmp() is used instead of str_casecmp(). Signed-off-by: Andrew Borodin --- lib/keybind.c | 3 +-- lib/tty/key.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/keybind.c b/lib/keybind.c index 62419be09..774dcb790 100644 --- a/lib/keybind.c +++ b/lib/keybind.c @@ -31,7 +31,6 @@ #include "lib/global.h" #include "lib/tty/key.h" /* KEY_M_ */ -#include "lib/strutil.h" /* str_casecmp() */ #include "lib/keybind.h" /*** global variables ****************************************************************************/ @@ -549,7 +548,7 @@ name_keymap_comparator (const void *p1, const void *p2) const name_keymap_t *m1 = (const name_keymap_t *) p1; const name_keymap_t *m2 = (const name_keymap_t *) p2; - return str_casecmp (m1->name, m2->name); + return g_ascii_strcasecmp (m1->name, m2->name); } /* --------------------------------------------------------------------------------------------- */ diff --git a/lib/tty/key.c b/lib/tty/key.c index 4928f2924..c4a8229ed 100644 --- a/lib/tty/key.c +++ b/lib/tty/key.c @@ -38,7 +38,6 @@ #include #include "lib/global.h" -#include "lib/strutil.h" /* str_casecmp */ #include "lib/vfs/mc-vfs/vfs.h" @@ -1149,7 +1148,7 @@ key_code_name_comparator (const void *p1, const void *p2) const key_code_name_t *n1 = *(const key_code_name_t **) p1; const key_code_name_t *n2 = *(const key_code_name_t **) p2; - return str_casecmp (n1->name, n2->name); + return g_ascii_strcasecmp (n1->name, n2->name); } /* --------------------------------------------------------------------------------------------- */ -- 2.11.4.GIT