2002-09-23 Roland McGrath <roland@redhat.com>

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

diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index c3d3787..6d461aa 100644 (file)
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -415,10 +415,10 @@ __argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...)
       avail = fs->end - fs->p;
       out = __vsnprintf (fs->p, avail, fmt, args);
       va_end (args);
-      if (out >= avail)
+      if ((size_t) out >= avail)
        size_guess = out + 1;
     }
-  while (out >= avail);
+  while ((size_t) out >= avail);
 
   fs->p += out;
 

diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 8998ee9..2efbadb 100644 (file)
--- 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-mmap2-eofsync.c b/libio/tst-mmap2-eofsync.c
index 60bad94..f369965 100644 (file)
--- 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 ed19631..4844438 100644 (file)
--- 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/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index cb57bc1..ab9eef4 100644 (file)
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 1998.
 
@@ -114,7 +114,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
   vec[1].iov_base = (void *) key;
   vec[1].iov_len = keylen;
 
-  if (__writev (sock, vec, 2) != sizeof (request_header) + keylen)
+  if ((size_t) __writev (sock, vec, 2) != sizeof (request_header) + keylen)
     {
       __close (sock);
       return -1;
@@ -182,7 +182,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
       total_len += gr_resp.gr_name_len + gr_resp.gr_passwd_len;
 
       /* Get this data.  */
-      if (__readv (sock, vec, 2) != total_len)
+      if ((size_t) __readv (sock, vec, 2) != total_len)
        {
          __close (sock);
          return -1;

diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index 1b24542..24efad3 100644 (file)
--- a/rt/tst-aio.c
+++ b/rt/tst-aio.c
@@ -76,14 +76,14 @@ test_file (const void *buf, size_t size, int fd, const char *msg)
       return 1;
     }
 
-  if (st.st_size != size)
+  if (st.st_size != (off_t) size)
     {
       error (0, errno, "%s: wrong size: %lu, should be %lu",
             msg, (unsigned long int) st.st_size, (unsigned long int) size);
       return 1;
     }
 
-  if (pread (fd, tmp, size, 0) != size)
+  if (pread (fd, tmp, size, 0) != (ssize_t) size)
     {
       error (0, errno, "%s: failed pread", msg);
       return 1;

diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c
index 4663d75..93e8cb2 100644 (file)
--- a/rt/tst-aio64.c
+++ b/rt/tst-aio64.c
@@ -77,14 +77,14 @@ test_file (const void *buf, size_t size, int fd, const char *msg)
       return 1;
     }
 
-  if (st.st_size != size)
+  if (st.st_size != (off_t) size)
     {
       error (0, errno, "%s: wrong size: %lu, should be %lu",
             msg, (unsigned long int) st.st_size, (unsigned long int) size);
       return 1;
     }
 
-  if (pread (fd, tmp, size, 0) != size)
+  if (pread (fd, tmp, size, 0) != (ssize_t) size)
     {
       error (0, errno, "%s: failed pread", msg);
       return 1;

diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index ab7998c..788290b 100644 (file)
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1035,7 +1035,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
            const char *mbs = (const char *) string;                          \
            mbstate_t mbstate;                                                \
                                                                              \
-           len = prec != -1 ? prec : strlen (mbs);                           \
+           len = prec != -1 ? (size_t) prec : strlen (mbs);                  \
                                                                              \
            /* Allocate dynamically an array which definitely is long         \
               enough for the wide character version.  */                     \

diff --git a/stdlib/msort.c b/stdlib/msort.c
index 880c5d1..45d6a99 100644 (file)
--- 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/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index 98d601c..bdedbac 100644 (file)
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -130,7 +130,7 @@ grantpt (int fd)
     }
 
   /* Get the group ID of the special `tty' group.  */
-  if (grbuflen == -1)
+  if (grbuflen == (size_t) -1L)
     /* `sysconf' does not support _SC_GETGR_R_SIZE_MAX.
        Try a moderate value.  */
     grbuflen = 1024;

diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c
index 7c27426..6725d16 100644 (file)
--- a/sysdeps/unix/sysv/linux/getcwd.c
+++ b/sysdeps/unix/sysv/linux/getcwd.c
@@ -143,7 +143,7 @@ __getcwd (char *buf, size_t size)
     {
       if (path[0] == '/')
        {
-         if (n >= alloc_size - 1)
+         if ((size_t) n >= alloc_size - 1)
            {
              if (buf == NULL)
                free (path);

diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c
index 09ba379..96a78c6 100644 (file)
--- a/sysdeps/unix/sysv/linux/gethostid.c
+++ b/sysdeps/unix/sysv/linux/gethostid.c
@@ -108,7 +108,7 @@ gethostid ()
 
   in.s_addr = 0;
   memcpy (&in, hp->h_addr,
-         (int) sizeof (in) < hp->h_length ? sizeof (in) : hp->h_length);
+         (int) sizeof (in) < hp->h_length ? (int) sizeof (in) : hp->h_length);
 
   /* For the return value to be not exactly the IP address we do some
      bit fiddling.  */

diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index b5e73bf..f8e6e92 100644 (file)
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -141,7 +141,7 @@ ttyname (int fd)
       /* This is for Linux 2.0.  */
       && ttyname_buf[0] != '[')
     {
-      if (len >= buflen)
+      if ((size_t) len >= buflen)
        return NULL;
       /* readlink need not terminate the string.  */
       ttyname_buf[len] = '\0';