diff options
author | Karl Ramm <kcr@1ts.org> | 2011-02-02 05:26:26 +0000 |
---|---|---|
committer | Karl Ramm <kcr@1ts.org> | 2011-02-02 05:26:26 +0000 |
commit | 71928f99ec3b0f5984d83438da266c7ef97afb5a (patch) | |
tree | dd57f77793dc4495dd085d0342ceef599f53b81a /server | |
parent | b24cbe87f78de4fda81ed0fc5502275e77d51a28 (diff) |
It is still not the 80s anymore -- remove all caddr_ts
Diffstat (limited to 'server')
-rw-r--r-- | server/kstuff.c | 4 | ||||
-rw-r--r-- | server/realm.c | 4 | ||||
-rw-r--r-- | server/server.c | 8 | ||||
-rw-r--r-- | server/timer.c | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/server/kstuff.c b/server/kstuff.c index 5f9cc4f..0743ece 100644 --- a/server/kstuff.c +++ b/server/kstuff.c @@ -69,7 +69,7 @@ GetKerberosData(int fd, /* file descr. to read from */ return(KFAILURE); } for (i=0; i<ticket.length; i++) { - if (read(fd, (caddr_t) &(ticket.dat[i]), 1) != 1) { + if (read(fd, &ticket.dat[i], 1) != 1) { syslog(LOG_WARNING,"bad tkt read"); return(KFAILURE); } @@ -116,7 +116,7 @@ SendKerberosData(int fd, /* file descriptor to write onto */ size_to_write = strlen (p); if ((written = write(fd, p, size_to_write)) != size_to_write) return (written < 0) ? errno : ZSRV_PKSHORT; - if ((written = write(fd, (caddr_t) (ticket->dat), ticket->length)) + if ((written = write(fd, ticket->dat, ticket->length)) != ticket->length) return (written < 0) ? errno : ZSRV_PKSHORT; diff --git a/server/realm.c b/server/realm.c index 225bbae..56bd71e 100644 --- a/server/realm.c +++ b/server/realm.c @@ -505,7 +505,7 @@ realm_init(void) for (jj = 0; jj < rlmnames[ii].nused; jj++) { hp = gethostbyname(rlmnames[ii].servers[jj]); if (hp) { - memmove((caddr_t) &addresses[found], (caddr_t)hp->h_addr, + memmove(&addresses[found], hp->h_addr, sizeof(struct in_addr)); found++; } else @@ -894,7 +894,7 @@ realm_sendit(ZNotice_t *notice, ZRealm *realm, int ack_to_sender) { - caddr_t pack; + char *pack; int packlen; Code_t retval; Unacked *nacked; diff --git a/server/server.c b/server/server.c index eab6ab1..9de847c 100644 --- a/server/server.c +++ b/server/server.c @@ -87,7 +87,7 @@ static void server_queue(Server *, int, void *, int, static void server_hello(Server *, int); static void setup_server(Server *, struct in_addr *); static void srv_rexmit(void *); -static void server_forw_reliable(Server *, caddr_t, int, ZNotice_t *); +static void server_forw_reliable(Server *, void *, int, ZNotice_t *); static Code_t admin_dispatch(ZNotice_t *, int, struct sockaddr_in *, Server *); static Code_t kill_clt(ZNotice_t *, Server *); @@ -538,7 +538,7 @@ server_kill_clt(Client *client) char buf[512], *lyst[2]; ZNotice_t notice; ZNotice_t *pnotice; /* speed hack */ - caddr_t pack; + char *pack; int packlen, auth; Code_t retval; @@ -1220,7 +1220,7 @@ server_forward(ZNotice_t *notice, struct sockaddr_in *who) { int i; - caddr_t pack; + void *pack; int packlen; Code_t retval; @@ -1256,7 +1256,7 @@ server_forward(ZNotice_t *notice, static void server_forw_reliable(Server *server, - caddr_t pack, + void *pack, int packlen, ZNotice_t *notice) { diff --git a/server/timer.c b/server/timer.c index fe4b064..932c819 100644 --- a/server/timer.c +++ b/server/timer.c @@ -49,11 +49,11 @@ static const char rcsid[] = * Timer *timer_set_rel (time_rel, proc, arg) * long time_rel; * void (*proc)(); - * caddr_t arg; + * void *arg; * Timer *timer_set_abs (time_abs, proc, arg) * long time_abs; * void (*proc)(); - * caddr_t arg; + * void *arg; * * void timer_reset(tmr) * Timer *tmr; |