diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-06 14:07:46 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-06 14:07:46 -0700 |
commit | fee5959dd8b389bc222618a35b042a92a1358c21 (patch) | |
tree | 936ae7da59bfa6d4c15f03929bbf6090190ea23a /lwlib/lwlib.c | |
parent | fd573f31dcaec9cd5170ba33af10d7c71c56822c (diff) |
Use c_strcasecmp for ASCII case-insensitive comparison.
Fixes: debbugs:11786
Diffstat (limited to 'lwlib/lwlib.c')
-rw-r--r-- | lwlib/lwlib.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index d436b18d22..5820be8d7a 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -24,6 +24,7 @@ Boston, MA 02110-1301, USA. */ #include <setjmp.h> #include <lisp.h> +#include <c-strcase.h> #include <sys/types.h> #include <stdio.h> @@ -112,31 +113,6 @@ safe_strdup (const char *s) return result; } -#ifdef HAVE_STRCASECMP -#define lwlib_strcasecmp(x,y) strcasecmp ((x), (y)) -#else - -/* Like strcmp but ignore differences in case. */ - -static int -lwlib_strcasecmp (const char *s1, const char *s2) -{ - while (1) - { - int c1 = *s1++; - int c2 = *s2++; - if (isupper (c1)) - c1 = tolower (c1); - if (isupper (c2)) - c2 = tolower (c2); - if (c1 != c2) - return (c1 > c2 ? 1 : -1); - if (c1 == 0) - return 0; - } -} -#endif /* HAVE_STRCASECMP */ - static void safe_free_str (char *s) { @@ -733,7 +709,7 @@ find_in_table (const char *type, const widget_creation_entry *table) { const widget_creation_entry* cur; for (cur = table; cur->type; cur++) - if (!lwlib_strcasecmp (type, cur->type)) + if (!c_strcasecmp (type, cur->type)) return cur->function; return NULL; } |