From 57b36a0a75d5a7577758d5238da92594f8151a81 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 24 Sep 2002 04:24:25 +0000 Subject: * catgets/open_catalog.c (__open_catalog): Don't use a value type as the __builtin_expect expression, just the Boolean value. * sysdeps/generic/wordexp.c (parse_glob): int -> size_t for counter. * sysdeps/unix/sysv/linux/opensock.c (__opensock): Likewise. * resolv/res_hconf.c (arg_service_list, parse_line): Likewise. * iconvdata/tst-loading.c (main): Likewise. * catgets/tst-catgets.c (main): Likewise. * stdlib/tst-xpg-basename.c (main): Likewise. * stdlib/tst-bsearch.c (main): Likewise. * stdio-common/test-vfprintf.c (main): Likewise. * stdio-common/tst-rndseek.c (do_test): Likewise. * libio/tst_swprintf.c (main): Likewise. * libio/tst-fgetws.c (main): Likewise. * wcsmbs/tst-mbrtowc.c (check_ascii): Likewise. * time/tst-posixtz.c (main): Likewise. * time/tst-strptime.c (test_tm): Likewise. * time/tst-strptime.c (main): Likewise. * time/tst-getdate.c (main): Likewise. * posix/tst-mmap.c (main): Likewise. * posix/tst-getaddrinfo.c (do_test): Likewise. * io/tst-getcwd.c (do_test): Likewise. * resolv/tst-aton.c (main): Likewise. * inet/tst-network.c (main): Likewise. * libio/tst-fgetws.c (main): Likewise. * sysdeps/posix/sprofil.c (add_region): int -> unsigned int for I. * sysdeps/unix/sysv/linux/ptsname.c (__ptsname_r): int -> unsigned int for PTYNO. * stdlib/msort.c (qsort): Add a cast to silence warning. * stdio-common/vfprintf.c (process_string_arg): Likewise. * libio/oldfileops.c (_IO_old_do_write): Likewise. * sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise. * argp/argp-fmtstream.c (__argp_fmtstream_printf): Likewise. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * sysdeps/unix/grantpt.c (grantpt): Likewise. * libio/tst-widetext.c (main): Likewise. * libio/tst-mmap2-eofsync.c (do_test): Likewise. * rt/tst-aio.c (test_file): Likewise. * rt/tst-aio64.c (test_file): Likewise. * resolv/tst-aton.c (main): Likewise. * catgets/catgetsinfo.h (CATGETS_MAGIC): Use U suffix on the constant. * ctype/ctype.c (__ctype_tolower, __ctype_toupper): Cast to int32_t instead of uint32_t in these macros. --- stdlib/msort.c | 2 +- stdlib/tst-bsearch.c | 6 +++--- stdlib/tst-xpg-basename.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'stdlib') diff --git a/stdlib/msort.c b/stdlib/msort.c index 880c5d1e3d..45d6a99b83 100644 --- a/stdlib/msort.c +++ b/stdlib/msort.c @@ -130,7 +130,7 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp) measured in bytes. */ /* If the memory requirements are too high don't allocate memory. */ - if (size / pagesize > phys_pages) + if (size / pagesize > (size_t) phys_pages) _quicksort (b, n, s, cmp); else { diff --git a/stdlib/tst-bsearch.c b/stdlib/tst-bsearch.c index 808ab9d8e5..04ec02a411 100644 --- a/stdlib/tst-bsearch.c +++ b/stdlib/tst-bsearch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2000. @@ -54,7 +54,7 @@ comp (const void *p1, const void *p2) int main (void) { - int cnt; + size_t cnt; int result = 0; struct entry key; struct entry *res; @@ -101,7 +101,7 @@ main (void) puts ("found an entry that's not there"); result = 1; } - + /* Now the array contains only one element - no entry should be found. */ for (cnt = 0; cnt < narr; ++cnt) { diff --git a/stdlib/tst-xpg-basename.c b/stdlib/tst-xpg-basename.c index dd22cf73b2..38f995ecb0 100644 --- a/stdlib/tst-xpg-basename.c +++ b/stdlib/tst-xpg-basename.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger , 1999. @@ -41,7 +41,7 @@ static struct int main (void) { - int i = 0; + size_t i = 0; int errors = 0; char path[1024]; char *file; -- cgit v1.2.3