diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | stdio-common/printf-parse.h | 2 | ||||
| -rw-r--r-- | stdlib/mblen.c | 5 | ||||
| -rw-r--r-- | wcsmbs/mbsinit.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 6f4383dbea..5caddff17e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * iconvdata/iso-2022-kr.c: Likewise. * wcsmbs/mbsinit.c: Likewise. * stdlib/mblen.c: Likewise. + * stdio-common/printf-parse.h: Likewise. 2000-04-06 Ulrich Drepper <drepper@redhat.com> diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h index c79c67d058..e9772ef666 100644 --- a/stdio-common/printf-parse.h +++ b/stdio-common/printf-parse.h @@ -105,7 +105,7 @@ find_spec (const UCHAR_T *format, mbstate_t *ps) int len; /* Remove any hints of a wrong encoding. */ - ps->count = 0; + ps->__count = 0; if (! isascii (*format) && (len = mbrlen (format, MB_CUR_MAX, ps)) > 0) format += len; else diff --git a/stdlib/mblen.c b/stdlib/mblen.c index 760da60d73..429048c99c 100644 --- a/stdlib/mblen.c +++ b/stdlib/mblen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -53,8 +53,7 @@ mblen (const char *s, size_t n) result = 0; else { - state.count = 0; - state.value = 0; + memset (&state, '\0', sizeof state); result = __mbrtowc (NULL, s, n, &state); diff --git a/wcsmbs/mbsinit.c b/wcsmbs/mbsinit.c index 727a9bc5e1..2982b5ec49 100644 --- a/wcsmbs/mbsinit.c +++ b/wcsmbs/mbsinit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. @@ -32,6 +32,6 @@ int __mbsinit (ps) const mbstate_t *ps; { - return ps == NULL || ps->count == 0; + return ps == NULL || ps->__count == 0; } weak_alias (__mbsinit, mbsinit) |