Update.

	* locale/findlocale.c (free_mem): Add cast to avoid warning.

diff --git a/ChangeLog b/ChangeLog
index 6d1e156fba62fa99d262e4e19f7c9ed7c1a10ea2..42d3333b70c98228d861e7537656bc319496576e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-08-27  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/findlocale.c (free_mem): Add cast to avoid warning.
+
        * intl/dcigettext.c (DCIGETTEXT): Remove _nl_find_language in code
        to determine invalid locale name.
        * locale/findlocale.c (_nl_find_locale): Likewise.

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 864b787ceac2b11ef3ee47dbedb0585fff6be841..da6d88a492a167104d7f483e3c49694c9593ceb2 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -524,8 +524,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 
          /* When this is a SUID binary we must not allow accessing files
             outside the dedicated directories.  */
-         if (ENABLE_SECURE
-             && memchr (single_locale, '/', single_locale) != NULL)
+         if (ENABLE_SECURE && strchr (single_locale, '/') != NULL)
            /* Ingore this entry.  */
            continue;
        }

diff --git a/locale/findlocale.c b/locale/findlocale.c
index c6adba84fa302c1f776421a755ee4df33a768731..5f600b6040825db9086988a487d6e74bad8c6090 100644 (file)
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -67,7 +67,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
 
   if (*name == NULL || (*name)[0] == '\0'
       || (__builtin_expect (__libc_enable_secure, 0)
-         && memchr (*name, '/', *name) != NULL))
+         && strchr (*name, '/') != NULL))
     *name = (char *) _nl_C_name;
 
   if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0
@@ -257,7 +257,7 @@ free_mem (void)
            if (data != NULL && data->usage_count != UNDELETABLE)
              _nl_unload_locale (data);
            runp = runp->next;
-           free (here->filename);
+           free ((char *) here->filename);
            free (here);
          }
       }