mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2001-01-30  Yong Li  <yong.li@asu.edu>

	* iconv/gconv_open.c (__gconv_open): Fix the variable used to
	set result->__data[cnt].__flags.
	* iconv/iconv_prog.c (main): Correct error handling method name.
This commit is contained in:
Ulrich Drepper 2001-01-31 07:00:50 +00:00
parent 7e118246da
commit c7fb46a94e
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-30 Yong Li <yong.li@asu.edu>
* iconv/gconv_open.c (__gconv_open): Fix the variable used to
set result->__data[cnt].__flags.
* iconv/iconv_prog.c (main): Correct error handling method name.
2001-01-29 Ben Collins <bcollins@debian.org> 2001-01-29 Ben Collins <bcollins@debian.org>
* sysdeps/sparc/fpu/fraiseexcpt.c: Include <float.h>. * sysdeps/sparc/fpu/fraiseexcpt.c: Include <float.h>.

5
iconv/gconv_open.c
View File

@ -35,7 +35,6 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
__gconv_t result = NULL; __gconv_t result = NULL;
size_t cnt = 0; size_t cnt = 0;
int res; int res;
int conv_flags = 0;
const char *errhand; const char *errhand;
const char *ignore; const char *ignore;
struct trans_struct *trans = NULL; struct trans_struct *trans = NULL;
@ -247,7 +246,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
output buffer. */ output buffer. */
if (cnt < nsteps - 1) if (cnt < nsteps - 1)
{ {
result->__data[cnt].__flags = conv_flags; result->__data[cnt].__flags = flags;
/* Allocate the buffer. */ /* Allocate the buffer. */
size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to); size = (GCONV_NCHAR_GOAL * steps[cnt].__max_needed_to);
@ -265,7 +264,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
else else
{ {
/* Handle the last entry. */ /* Handle the last entry. */
result->__data[cnt].__flags = conv_flags | __GCONV_IS_LAST; result->__data[cnt].__flags = flags | __GCONV_IS_LAST;
break; break;
} }

2
iconv/iconv_prog.c
View File

@ -168,7 +168,7 @@ main (int argc, char *argv[])
cp = mempcpy (newp, to_code, errhand - to_code); cp = mempcpy (newp, to_code, errhand - to_code);
while (nslash-- > 0) while (nslash-- > 0)
*cp++ = '/'; *cp++ = '/';
memcpy (cp, "NEEDED", sizeof ("NEEDED")); memcpy (cp, "IGNORE", sizeof ("IGNORE"));
to_code = newp; to_code = newp;
} }

6
localedata/ChangeLog
View File

@ -1,3 +1,9 @@
2001-01-30 Ulrich Drepper <drepper@redhat.com>
* locales/fi_FI: Remove FIXME comments.
* locales/sv_FI: Likewise.
Patch by Marko Myllynen <myllynen@lut.fi>.
2001-01-23 Jakub Jelinek <jakub@redhat.com> 2001-01-23 Jakub Jelinek <jakub@redhat.com>
* locales/cs_CZ (yesexpr, noexpr): Add caret prefix. * locales/cs_CZ (yesexpr, noexpr): Add caret prefix.