summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-27 19:05:19 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-27 19:05:19 +0000
commit6adc15f574fd12e097fc8c96e969d0092243069e (patch)
tree2a4468ba22ed224b27db818001449f098261d2a6
parent4944d5d63f26970c9a65965f907e49d30bf53ca6 (diff)
downloadglibc-6adc15f574fd12e097fc8c96e969d0092243069e.tar.gz
glibc-6adc15f574fd12e097fc8c96e969d0092243069e.tar.xz
glibc-6adc15f574fd12e097fc8c96e969d0092243069e.zip
Update.
	* locale/findlocale.c (free_mem): Add cast to avoid warning.
-rw-r--r--ChangeLog2
-rw-r--r--intl/dcigettext.c3
-rw-r--r--locale/findlocale.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d1e156fba..42d3333b70 100644
--- 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 864b787cea..da6d88a492 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 c6adba84fa..5f600b6040 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);
 	  }
       }