diff options
| author | Roland McGrath <roland@gnu.org> | 2002-05-29 00:13:04 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-05-29 00:13:04 +0000 |
| commit | 9a562a9e06ed6298dd00a57611feb68b287f22f0 (patch) | |
| tree | 775cd6c5d04496ec6c28508c6e9e3370aa166410 /pfinet | |
| parent | 9f91ef5d685203ad473bd4da1dd4309a981d5e1d (diff) | |
2002-05-28 Roland McGrath <roland@frob.com>
* io-ops.c (S_io_write, S_io_read): u_int -> size_t
(S_io_restrict_auth): Likewise.
(S_io_reauthenticate): Likewise.
* socket-ops.c (S_socket_getopt, S_socket_setopt): Likewise.
(S_socket_send, S_socket_recv): Likewise.
Diffstat (limited to 'pfinet')
| -rw-r--r-- | pfinet/io-ops.c | 16 | ||||
| -rw-r--r-- | pfinet/socket-ops.c | 20 |
2 files changed, 17 insertions, 19 deletions
diff --git a/pfinet/io-ops.c b/pfinet/io-ops.c index bd4f590c..4964c80a 100644 --- a/pfinet/io-ops.c +++ b/pfinet/io-ops.c @@ -1,5 +1,5 @@ /* - Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000,02 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -36,7 +36,7 @@ error_t S_io_write (struct sock_user *user, char *data, - u_int datalen, + size_t datalen, off_t offset, mach_msg_type_number_t *amount) { @@ -69,7 +69,7 @@ S_io_write (struct sock_user *user, error_t S_io_read (struct sock_user *user, char **data, - u_int *datalen, + size_t *datalen, off_t offset, mach_msg_type_number_t amount) { @@ -318,9 +318,9 @@ S_io_reauthenticate (struct sock_user *user, struct sock_user *newuser; uid_t gubuf[20], ggbuf[20], aubuf[20], agbuf[20]; uid_t *gen_uids, *gen_gids, *aux_uids, *aux_gids; - u_int genuidlen, gengidlen, auxuidlen, auxgidlen; + size_t genuidlen, gengidlen, auxuidlen, auxgidlen; error_t err; - int i, j; + size_t i, j; auth_t auth; mach_port_t newright; @@ -391,10 +391,8 @@ error_t S_io_restrict_auth (struct sock_user *user, mach_port_t *newobject, mach_msg_type_name_t *newobject_type, - uid_t *uids, - u_int uidslen, - uid_t *gids, - u_int gidslen) + uid_t *uids, size_t uidslen, + uid_t *gids, size_t gidslen) { struct sock_user *newuser; int i, j; diff --git a/pfinet/socket-ops.c b/pfinet/socket-ops.c index 5cbc74b3..e01ce2e3 100644 --- a/pfinet/socket-ops.c +++ b/pfinet/socket-ops.c @@ -1,5 +1,5 @@ /* Interface functions for the socket.defs interface. - Copyright (C) 1995,96,97,99,2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,99,2000,02 Free Software Foundation, Inc. Written by Michael I. Bushnell, p/BSG. This file is part of the GNU Hurd. @@ -79,7 +79,7 @@ S_socket_create (struct trivfs_protid *master, if (! err) isroot = 1; } - + err = - (*net_families[PF_INET]->create) (sock, protocol); if (err) sock_release (sock); @@ -368,7 +368,7 @@ S_socket_getopt (struct sock_user *user, int level, int option, char **data, - u_int *datalen) + size_t *datalen) { error_t err; @@ -395,7 +395,7 @@ S_socket_setopt (struct sock_user *user, int level, int option, char *data, - u_int datalen) + size_t datalen) { error_t err; @@ -422,11 +422,11 @@ S_socket_send (struct sock_user *user, struct sock_addr *addr, int flags, char *data, - u_int datalen, + size_t datalen, mach_port_t *ports, - u_int nports, + size_t nports, char *control, - u_int controllen, + size_t controllen, mach_msg_type_number_t *amount) { int sent; @@ -469,12 +469,12 @@ S_socket_recv (struct sock_user *user, mach_msg_type_name_t *addrporttype, int flags, char **data, - u_int *datalen, + size_t *datalen, mach_port_t **ports, mach_msg_type_name_t *portstype, - u_int *nports, + size_t *nports, char **control, - u_int *controllen, + size_t *controllen, int *outflags, mach_msg_type_number_t amount) { |