diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-16 01:04:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-16 01:04:03 +0000 |
| commit | 638bb1f3941f1714659150a2202627d3820d6b05 (patch) | |
| tree | a101f92e76c6b8f0f94606a23480a4712850eb4a /posix/fnmatch.c | |
| parent | e993ec9a5b59d64e7037182376f3928af752ccf3 (diff) | |
| download | glibc-638bb1f3941f1714659150a2202627d3820d6b05.tar.gz glibc-638bb1f3941f1714659150a2202627d3820d6b05.tar.xz glibc-638bb1f3941f1714659150a2202627d3820d6b05.zip | |
* nscd/cache.c (cache_search): Give first arg type `request_type'.
* nscd/nscd.h: Update decl. * nscd/nscd_getpw_r.c (nscd_getpw_r): Add casts for signedness. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * elf/dl-close.c (_dl_close): Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c (__chown): int -> size_t * io/fts.c (fts_build): Likewise. * elf/cache.c (add_to_cache): Likewise. * locale/programs/locarchive.c (show_archive_content): Likewise. * posix/fnmatch.c (fnmatch): Tweak __builtin_expect use. * include/ctype.h (__ctype_b_loc): Tweak type punning to make gcc 3.3 happy. (__ctype_toupper_loc, __ctype_tolower_loc): Likewise.
Diffstat (limited to 'posix/fnmatch.c')
| -rw-r--r-- | posix/fnmatch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/posix/fnmatch.c b/posix/fnmatch.c index b677e4bf41..c521a25b70 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-93,96-99,2000,01,02 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003 + 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 @@ -333,7 +334,7 @@ fnmatch (pattern, string, flags) /* Convert the strings into wide characters. */ memset (&ps, '\0', sizeof (ps)); n = mbsrtowcs (NULL, &pattern, 0, &ps); - if (__builtin_expect (n, 0) == (size_t) -1) + if (__builtin_expect (n == (size_t) -1, 0)) /* Something wrong. XXX Do we have to set `errno' to something which mbsrtows hasn't already done? */ @@ -344,7 +345,7 @@ fnmatch (pattern, string, flags) assert (mbsinit (&ps)); n = mbsrtowcs (NULL, &string, 0, &ps); - if (__builtin_expect (n, 0) == (size_t) -1) + if (__builtin_expect (n == (size_t) -1, 0)) /* Something wrong. XXX Do we have to set `errno' to something which mbsrtows hasn't already done? */ |