summaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-03-16 01:04:03 +0000
committerRoland McGrath <roland@gnu.org>2003-03-16 01:04:03 +0000
commit638bb1f3941f1714659150a2202627d3820d6b05 (patch)
treea101f92e76c6b8f0f94606a23480a4712850eb4a /nscd
parente993ec9a5b59d64e7037182376f3928af752ccf3 (diff)
downloadglibc-638bb1f3941f1714659150a2202627d3820d6b05.tar.gz
* nscd/cache.c (cache_search): Give first arg type `request_type'.
* nscd/nscd.h: Update decl. * nscd/nscd_getpw_r.c (nscd_getpw_r): Add casts for signedness. * nscd/nscd_getgr_r.c (nscd_getgr_r): Likewise. * elf/dl-close.c (_dl_close): Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c (__chown): int -> size_t * io/fts.c (fts_build): Likewise. * elf/cache.c (add_to_cache): Likewise. * locale/programs/locarchive.c (show_archive_content): Likewise. * posix/fnmatch.c (fnmatch): Tweak __builtin_expect use. * include/ctype.h (__ctype_b_loc): Tweak type punning to make gcc 3.3 happy. (__ctype_toupper_loc, __ctype_tolower_loc): Likewise.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/cache.c4
-rw-r--r--nscd/nscd.h4
-rw-r--r--nscd/nscd_getgr_r.c6
-rw-r--r--nscd/nscd_getpw_r.c6
4 files changed, 10 insertions, 10 deletions
diff --git a/nscd/cache.c b/nscd/cache.c
index 31a867adf5..d8339e915d 100644
--- a/nscd/cache.c
+++ b/nscd/cache.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 1999, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -39,7 +39,7 @@
This function must be called with the read-lock held. */
struct hashentry *
-cache_search (int type, void *key, size_t len, struct database *table,
+cache_search (request_type type, void *key, size_t len, struct database *table,
uid_t owner)
{
unsigned long int hash = __nis_hash (key, len) % table->module;
diff --git a/nscd/nscd.h b/nscd/nscd.h
index 11a30176df..f500b1598f 100644
--- a/nscd/nscd.h
+++ b/nscd/nscd.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (c) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998.
@@ -118,7 +118,7 @@ extern void send_stats (int fd, struct database dbs[lastdb]);
extern int receive_print_stats (void) __attribute__ ((__noreturn__));
/* cache.c */
-extern struct hashentry *cache_search (int type, void *key, size_t len,
+extern struct hashentry *cache_search (request_type, void *key, size_t len,
struct database *table, uid_t owner);
extern void cache_add (int type, void *key, size_t len,
const void *packet, size_t iovtotal, void *data,
diff --git a/nscd/nscd_getgr_r.c b/nscd/nscd_getgr_r.c
index 49f4b51304..2d09ed92f2 100644
--- a/nscd/nscd_getgr_r.c
+++ b/nscd/nscd_getgr_r.c
@@ -114,8 +114,8 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
vec[1].iov_base = (void *) key;
vec[1].iov_len = keylen;
- nbytes = (size_t) TEMP_FAILURE_RETRY (__writev (sock, vec, 2));
- if (nbytes != sizeof (request_header) + keylen)
+ nbytes = TEMP_FAILURE_RETRY (__writev (sock, vec, 2));
+ if (nbytes != (ssize_t) (sizeof (request_header) + keylen))
{
__close (sock);
return -1;
@@ -123,7 +123,7 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
nbytes = TEMP_FAILURE_RETRY (__read (sock, &gr_resp,
sizeof (gr_response_header)));
- if (nbytes != sizeof (gr_response_header))
+ if (nbytes != (ssize_t) sizeof (gr_response_header))
{
__close (sock);
return -1;
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c
index f4fa75fa6f..160e9ffa27 100644
--- a/nscd/nscd_getpw_r.c
+++ b/nscd/nscd_getpw_r.c
@@ -113,8 +113,8 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
vec[1].iov_base = (void *) key;
vec[1].iov_len = keylen;
- nbytes = (size_t) TEMP_FAILURE_RETRY (__writev (sock, vec, 2));
- if (nbytes != sizeof (request_header) + keylen)
+ nbytes = TEMP_FAILURE_RETRY (__writev (sock, vec, 2));
+ if (nbytes != (ssize_t) (sizeof (request_header) + keylen))
{
__close (sock);
return -1;
@@ -122,7 +122,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
nbytes = TEMP_FAILURE_RETRY (__read (sock, &pw_resp,
sizeof (pw_response_header)));
- if (nbytes != sizeof (pw_response_header))
+ if (nbytes != (ssize_t) sizeof (pw_response_header))
{
__close (sock);
return -1;