* libc/stdlib/wctomb_r.c (_wctomb_r): Avoid gcc warnings on cygwin.
* libc/search/hash.c (__hash_open): Likewise.
This commit is contained in:
parent
2ba0944446
commit
f65607751c
|
@ -1,3 +1,8 @@
|
||||||
|
2007-05-16 Eric Blake <ebb9@byu.net>
|
||||||
|
|
||||||
|
* libc/stdlib/wctomb_r.c (_wctomb_r): Avoid gcc warnings on cygwin.
|
||||||
|
* libc/search/hash.c (__hash_open): Likewise.
|
||||||
|
|
||||||
2007-05-14 Eric Blake <ebb9@byu.net>
|
2007-05-14 Eric Blake <ebb9@byu.net>
|
||||||
|
|
||||||
Reduce stack size of *printf.
|
Reduce stack size of *printf.
|
||||||
|
|
|
@ -110,7 +110,11 @@ __hash_open(file, flags, mode, info, dflags)
|
||||||
{
|
{
|
||||||
HTAB *hashp;
|
HTAB *hashp;
|
||||||
|
|
||||||
|
#ifdef __USE_INTERNAL_STAT64
|
||||||
|
struct stat64 statbuf;
|
||||||
|
#else
|
||||||
struct stat statbuf;
|
struct stat statbuf;
|
||||||
|
#endif
|
||||||
DB *dbp;
|
DB *dbp;
|
||||||
int bpages, hdrsize, new_table, nsegs, save_errno;
|
int bpages, hdrsize, new_table, nsegs, save_errno;
|
||||||
|
|
||||||
|
|
|
@ -13,9 +13,14 @@ int
|
||||||
_DEFUN (_wctomb_r, (r, s, wchar, state),
|
_DEFUN (_wctomb_r, (r, s, wchar, state),
|
||||||
struct _reent *r _AND
|
struct _reent *r _AND
|
||||||
char *s _AND
|
char *s _AND
|
||||||
wchar_t wchar _AND
|
wchar_t _wchar _AND
|
||||||
mbstate_t *state)
|
mbstate_t *state)
|
||||||
{
|
{
|
||||||
|
/* Avoids compiler warnings about comparisons that are always false
|
||||||
|
due to limited range when sizeof(wchar_t) is 2 but sizeof(wint_t)
|
||||||
|
is 4, as is the case on cygwin. */
|
||||||
|
wint_t wchar = _wchar;
|
||||||
|
|
||||||
if (strlen (__lc_ctype) <= 1)
|
if (strlen (__lc_ctype) <= 1)
|
||||||
{ /* fall-through */ }
|
{ /* fall-through */ }
|
||||||
else if (!strcmp (__lc_ctype, "C-UTF-8"))
|
else if (!strcmp (__lc_ctype, "C-UTF-8"))
|
||||||
|
@ -171,4 +176,3 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue