diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2008-07-16 03:00:25 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2008-07-16 03:02:20 +0300 |
| commit | b8dd07f855c555af56cbf0f69df799f424da2cca (patch) | |
| tree | 71d58b2fd2e939f485d29d235cde37aea53551a8 | |
| parent | ad87c72edcc0d1f56658e0c4e73af335c8d5a516 (diff) | |
HAL: Remove grotesque open-coded strcasestr
Not only was this pretty ugly, but it didn't even work on systems
without strcasestr anyway, due to the define not being in dix-config.h.
Lack of strcasestr is handled transparently with the version from
FreeBSD now anyway, so, huzzah.
| -rw-r--r-- | config/hal.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/config/hal.c b/config/hal.c index f4eb438ea..b6d7402a6 100644 --- a/config/hal.c +++ b/config/hal.c @@ -262,17 +262,7 @@ device_added(LibHalContext *hal_ctx, const char *udi) * Since we can't predict the order in which the keys * arrive, we need to store them. */ -#ifndef HAVE_STRCASESTR - int psi_key_len = strlen(psi_key); - char *lower_psi_key = xalloc(psi_key_len + 1); - - CopyISOLatin1Lowered((unsigned char *) lower_psi_key, - (unsigned char *) psi_key, - psi_key_len); - if ((tmp = strstr(lower_psi_key, "xkb"))) -#else if ((tmp = strcasestr(psi_key, "xkb"))) -#endif { if (!strcasecmp(&tmp[3], "layout")) { @@ -301,9 +291,6 @@ device_added(LibHalContext *hal_ctx, const char *udi) add_option(&options, psi_key + sizeof(LIBHAL_PROP_KEY)-1, tmp_val); xfree(tmp_val); } -#ifndef HAVE_STRCASESTR - xfree(lower_psi_key); -#endif } } else if (!strncasecmp(psi_key, LIBHAL_XKB_PROP_KEY, sizeof(LIBHAL_XKB_PROP_KEY)-1)){ |