* 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.

5 files changed, 6 insertions, 6 deletions

diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 8998ee9b0d..2efbadb44e 100644
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -266,7 +266,7 @@ _IO_old_do_write (fp, data, to_do)
      const char *data;
      _IO_size_t to_do;
 {
-  return (to_do == 0 || old_do_write (fp, data, to_do) == to_do)
+  return (to_do == 0 || (_IO_size_t) old_do_write (fp, data, to_do) == to_do)
 	 ? 0 : EOF;
 }
 
diff --git a/libio/tst-fgetws.c b/libio/tst-fgetws.c
index 88b6261bb8..66fb9d1d8e 100644
--- a/libio/tst-fgetws.c
+++ b/libio/tst-fgetws.c
@@ -13,7 +13,7 @@
 int
 main (int argc, char *argv[])
 {
-  int i;
+  size_t i;
   FILE   *fp;
   wchar_t *ret, wcs[WIDE_STR_LEN];
   int result = 0;
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
     }
   else
     {
-      int i;
+      size_t i;
 
       printf ("Return Value: %p\n", ret);
       for (i = 0; i < wcslen (wcs) + 1; i++)
diff --git a/libio/tst-mmap2-eofsync.c b/libio/tst-mmap2-eofsync.c
index 60bad94027..f3699656ab 100644
--- a/libio/tst-mmap2-eofsync.c
+++ b/libio/tst-mmap2-eofsync.c
@@ -78,7 +78,7 @@ do_test (void)
     }
 
   c = write (temp_fd, pages + pagesize, pagesize);
-  if (c == pagesize)
+  if (c == (ssize_t) pagesize)
     printf ("wrote more to file\n");
   else
     {
diff --git a/libio/tst-widetext.c b/libio/tst-widetext.c
index ed196317a9..48444380d8 100644
--- a/libio/tst-widetext.c
+++ b/libio/tst-widetext.c
@@ -89,7 +89,7 @@ main (void)
 	exit (1);
       }
 
-    if  ((size_t) nonr == -1 )
+    if  (nonr == (size_t) -1)
       {
 	printf ("\
 %u: iconv returned with %Zd and errno = %m (inleft: %Zd, outleft: %Zd)\n",
diff --git a/libio/tst_swprintf.c b/libio/tst_swprintf.c
index a82ef88e7c..4dadd58741 100644
--- a/libio/tst_swprintf.c
+++ b/libio/tst_swprintf.c
@@ -21,7 +21,7 @@ static const struct
 int
 main (int argc, char *argv[])
 {
-  int n;
+  size_t n;
   int result = 0;
 
   puts ("test 1");