Update.

	* intl/localealias.c (read_alias_file): Use unsigned char for
	local variables.  Remove unused variable tp.
	* intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
	for type of codeset.  For loosing Solaris systems.
	* intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
	* intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
	len if not needed.
	Patches by Jim Meyering.

diff --git a/ChangeLog b/ChangeLog
index 76eaca06ff1b16654ffbe06b032e73275247e7e0..256bcef84352828bb1f506891738a075b4d76466 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 1998-04-29  Ulrich Drepper  <drepper@cygnus.com>
 
+       * intl/localealias.c (read_alias_file): Use unsigned char for
+       local variables.  Remove unused variable tp.
+       * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char *
+       for type of codeset.  For loosing Solaris systems.
+       * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset.
+       * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable
+       len if not needed.
+       Patches by Jim Meyering.
+
        * stdio-common/vfprintf.c [%S]: Don't clear mbstate twice;
        wcsrtombs must put it into initial state.
 

diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index 38625445756cf189edfbffc803db631961ac393c..be78ae0f23e33ebf71df5f4ca2042139caf4e7c4 100644 (file)
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -139,7 +139,9 @@ BINDTEXTDOMAIN (domainname, dirname)
   else
     {
       /* We have to create a new binding.  */
+#if !defined _LIBC && !defined HAVE_STRDUP
       size_t len;
+#endif
       struct binding *new_binding =
        (struct binding *) malloc (sizeof (*new_binding));
 

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 5309cc73ed2e737716f0bc43f409e946152e13f1..bd12a0a955b6e87a05601c305e58833d02c335bf 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This file is part of the GNU C Library.  Its master source is NOT part of
@@ -355,7 +355,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
    names.  */
 const char *
 _nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
+     const unsigned char *codeset;
      size_t name_len;
 {
   int len = 0;

diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 274066764c8425769afd55bf015b32494e705c41..8fabe639031096ffd9e27789051c6ea7a6ef3dda 100644 (file)
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -51,7 +51,7 @@ struct loaded_l10nfile
 };
 
 
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
+extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset,
                                                  size_t name_len));
 
 extern struct loaded_l10nfile *

diff --git a/intl/localealias.c b/intl/localealias.c
index d6ddf0c2c6dffcdd282277f325aaed14553a1bfd..7f668ec360ee47e6bf7fb24981ea145f55525545 100644 (file)
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -256,10 +256,10 @@ read_alias_file (fname, fname_len)
         b) these fields must be usable as file names and so must not
            be that long
        */
-      char buf[BUFSIZ];
-      char *alias;
-      char *value;
-      char *cp;
+      unsigned char buf[BUFSIZ];
+      unsigned char *alias;
+      unsigned char *value;
+      unsigned char *cp;
 
       if (fgets (buf, sizeof buf, fp) == NULL)
        /* EOF reached.  */
@@ -299,7 +299,6 @@ read_alias_file (fname, fname_len)
 
          if (cp[0] != '\0')
            {
-             char *tp;
              size_t alias_len;
              size_t value_len;