From 57b36a0a75d5a7577758d5238da92594f8151a81 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
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.
---
 resolv/res_hconf.c | 4 ++--
 resolv/tst-aton.c  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'resolv')

diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 8da2727a79..132dda7599 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -112,7 +112,7 @@ arg_service_list (const char *fname, int line_num, const char *args,
   enum Name_Service service;
   const char *start;
   size_t len;
-  int i;
+  size_t i;
   static struct
   {
     const char * name;
@@ -339,7 +339,7 @@ parse_line (const char *fname, int line_num, const char *str)
   const char *start;
   struct cmd *c = 0;
   size_t len;
-  int i;
+  size_t i;
 
   str = skip_ws (str);
 
diff --git a/resolv/tst-aton.c b/resolv/tst-aton.c
index 3469b19260..6cb5960496 100644
--- a/resolv/tst-aton.c
+++ b/resolv/tst-aton.c
@@ -39,7 +39,7 @@ static struct tests
   { "1.2.256.4", 0, 0 },
   { "1.2.3.0x100", 0, 0 },
   { "323543357756889", 0, 0 },
-  { "10.1.2.3.4", 0, 0},  
+  { "10.1.2.3.4", 0, 0},
 };
 
 
@@ -47,13 +47,13 @@ int
 main (int argc, char *argv[])
 {
   int result = 0;
-  int cnt;
+  size_t cnt;
 
   for (cnt = 0; cnt < sizeof (tests) / sizeof (tests[0]); ++cnt)
     {
       struct in_addr addr;
 
-      if (inet_aton (tests[cnt].input, &addr) != tests[cnt].valid)
+      if ((int) inet_aton (tests[cnt].input, &addr) != tests[cnt].valid)
 	{
 	  if (tests[cnt].valid)
 	    printf ("\"%s\" not seen as valid IP address\n", tests[cnt].input);
-- 
cgit v1.2.3