diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | intl/dcigettext.c | 3 | ||||
| -rw-r--r-- | locale/findlocale.c | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -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 864b787..da6d88a 100644 --- 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 c6adba8..5f600b6 100644 --- 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); } } |