diff options
author | Stefan Farfeleder <stefanf@FreeBSD.org> | 2005-03-11 14:17:12 +0000 |
---|---|---|
committer | Stefan Farfeleder <stefanf@FreeBSD.org> | 2005-03-11 14:17:12 +0000 |
commit | 595e532309e983d7d6c86f88867f786b3ccaa756 (patch) | |
tree | c2658d263c7610120f6015692c79de70adbe8bc0 /usr.sbin | |
parent | c2d34cc331dbaaae52d689a69bd4a2da5013d504 (diff) | |
download | src-595e532309e983d7d6c86f88867f786b3ccaa756.tar.gz src-595e532309e983d7d6c86f88867f786b3ccaa756.zip |
Use socklen_t where appropriate.
Notes
Notes:
svn path=/head/; revision=143415
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/dconschat/dconschat.c | 7 | ||||
-rw-r--r-- | usr.sbin/ypserv/yp_dnslookup.c | 14 | ||||
-rw-r--r-- | usr.sbin/ypserv/yp_main.c | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/usr.sbin/dconschat/dconschat.c b/usr.sbin/dconschat/dconschat.c index 6462e3dec3cd..83e7dd0c32d4 100644 --- a/usr.sbin/dconschat/dconschat.c +++ b/usr.sbin/dconschat/dconschat.c @@ -576,12 +576,13 @@ dconschat_init_socket(struct dcons_state *dc, int port, char *host, int sport) static int dconschat_accept_socket(struct dcons_state *dc, struct dcons_port *p) { - int foo, ns, flags; + socklen_t addrlen; + int ns, flags; struct kevent kev; /* accept connection */ - foo = p->res->ai_addrlen; - ns = accept(p->s, p->res->ai_addr, &foo); + addrlen = p->res->ai_addrlen; + ns = accept(p->s, p->res->ai_addr, &addrlen); if (ns < 0) err(1, "accept"); if (verbose) diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c index 50270fc7304b..a5c8eab7aa0f 100644 --- a/usr.sbin/ypserv/yp_dnslookup.c +++ b/usr.sbin/ypserv/yp_dnslookup.c @@ -346,8 +346,8 @@ yp_run_dnsq(void) char buf[sizeof(HEADER) + MAXPACKET]; char retrybuf[MAXHOSTNAMELEN]; struct sockaddr_in sin; + socklen_t len; int rval; - int len; HEADER *hptr; struct hostent *hent; @@ -411,10 +411,12 @@ ypstat yp_async_lookup_name(struct svc_req *rqstp, char *name) { register struct circleq_dnsentry *q; - int type, len; + socklen_t len; + int type; /* Check for SOCK_DGRAM or SOCK_STREAM -- we need to know later */ - type = -1; len = sizeof(type); + type = -1; + len = sizeof(type); if (getsockopt(rqstp->rq_xprt->xp_fd, SOL_SOCKET, SO_TYPE, &type, &len) == -1) { yp_error("getsockopt failed: %s", strerror(errno)); @@ -465,11 +467,13 @@ yp_async_lookup_addr(struct svc_req *rqstp, char *addr) { register struct circleq_dnsentry *q; char buf[MAXHOSTNAMELEN]; + socklen_t len; int a, b, c, d; - int type, len; + int type; /* Check for SOCK_DGRAM or SOCK_STREAM -- we need to know later */ - type = -1; len = sizeof(type); + type = -1; + len = sizeof(type); if (getsockopt(rqstp->rq_xprt->xp_fd, SOL_SOCKET, SO_TYPE, &type, &len) == -1) { yp_error("getsockopt failed: %s", strerror(errno)); diff --git a/usr.sbin/ypserv/yp_main.c b/usr.sbin/ypserv/yp_main.c index d9132748be24..b786ca74ac2b 100644 --- a/usr.sbin/ypserv/yp_main.c +++ b/usr.sbin/ypserv/yp_main.c @@ -229,7 +229,7 @@ main(int argc, char *argv[]) int sock; int proto = 0; struct sockaddr_in saddr; - int asize = sizeof (saddr); + socklen_t asize = sizeof (saddr); int ch; while ((ch = getopt(argc, argv, "hdnp:")) != -1) { |