OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid warning in iofwide

This commit is contained in:
Ulrich Drepper 2011-10-15 09:52:26 -04:00
parent 538faaa7f2
commit ab6737ffd0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2011-10-15 Ulrich Drepper <drepper@gmail.com>
* libio/iofwide.c (do_length): Avoid warning.
* ctype/ctype.h (__isctype_f): Add missing __THROW.
2011-10-14 Ulrich Drepper <drepper@gmail.com>

11
libio/iofwide.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999-2003, 2005 Free Software Foundation, Inc.
/* Copyright (C) 1999-2003, 2005, 2011 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
@ -471,7 +471,6 @@ do_length (struct _IO_codecvt *codecvt, __mbstate_t *statep,
const unsigned char *cp = (const unsigned char *) from_start;
wchar_t to_buf[max];
struct __gconv_step *gs = codecvt->__cd_in.__cd.__steps;
int status;
size_t dummy;
codecvt->__cd_in.__cd.__data[0].__outbuf = (unsigned char *) to_buf;
@ -484,10 +483,10 @@ do_length (struct _IO_codecvt *codecvt, __mbstate_t *statep,
PTR_DEMANGLE (fct);
#endif
status = DL_CALL_FCT (fct,
(gs, codecvt->__cd_in.__cd.__data, &cp,
(const unsigned char *) from_end, NULL,
&dummy, 0, 0));
DL_CALL_FCT (fct,
(gs, codecvt->__cd_in.__cd.__data, &cp,
(const unsigned char *) from_end, NULL,
&dummy, 0, 0));
result = cp - (const unsigned char *) from_start;
#else