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. --- sysdeps/unix/sysv/linux/getcwd.c | 2 +- sysdeps/unix/sysv/linux/gethostid.c | 2 +- sysdeps/unix/sysv/linux/opensock.c | 2 +- sysdeps/unix/sysv/linux/ptsname.c | 4 ++-- sysdeps/unix/sysv/linux/ttyname.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c index 7c27426f3c..6725d16058 100644 --- 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 09ba379f39..96a78c6da1 100644 --- 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/opensock.c b/sysdeps/unix/sysv/linux/opensock.c index 7913886b6c..2252980789 100644 --- a/sysdeps/unix/sysv/linux/opensock.c +++ b/sysdeps/unix/sysv/linux/opensock.c @@ -59,7 +59,7 @@ __opensock (void) char fname[sizeof "/proc/" + 14]; int result; int has_proc; - int cnt; + size_t cnt; /* We already know which family to use from the last call. Use it again. */ diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index 084e573260..da4809f372 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -75,7 +75,7 @@ __ptsname_r (int fd, char *buf, size_t buflen) { int save_errno = errno; struct stat64 st; - int ptyno; + unsigned int ptyno; if (buf == NULL) { @@ -102,7 +102,7 @@ __ptsname_r (int fd, char *buf, size_t buflen) numbuf[sizeof (numbuf) - 1] = '\0'; p = _itoa_word (ptyno, &numbuf[sizeof (numbuf) - 1], 10, 0); - if (buflen < devptslen + &numbuf[sizeof (numbuf)] - p) + if (buflen < devptslen + (&numbuf[sizeof (numbuf)] - p)) { __set_errno (ERANGE); return ERANGE; diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index b5e73bf1af..f8e6e925a4 100644 --- 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'; -- cgit v1.2.3