diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | intl/bindtextdom.c | 2 | ||||
| -rw-r--r-- | intl/l10nflist.c | 4 | ||||
| -rw-r--r-- | intl/loadinfo.h | 4 | ||||
| -rw-r--r-- | intl/localealias.c | 9 |
5 files changed, 19 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 76eaca06ff..256bcef843 100644 --- 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 3862544575..be78ae0f23 100644 --- 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 5309cc73ed..bd12a0a955 100644 --- 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 274066764c..8fabe63903 100644 --- 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 d6ddf0c2c6..7f668ec360 100644 --- 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; |