From 8655a91f5826e86edfb603f7320dcc537821b383 Mon Sep 17 00:00:00 2001 From: stefanf Date: Fri, 11 Mar 2005 14:17:12 +0000 Subject: Use socklen_t where appropriate. --- usr.sbin/ypserv/yp_dnslookup.c | 14 +++++++++----- usr.sbin/ypserv/yp_main.c | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'usr.sbin/ypserv') diff --git a/usr.sbin/ypserv/yp_dnslookup.c b/usr.sbin/ypserv/yp_dnslookup.c index 50270fc..a5c8eab 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 d913274..b786ca7 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) { -- cgit v1.1