From: Sascha Wildner <saw@online.de>
Date: Sat, 17 Aug 2013 17:18:17 +0000 (+0200)
Subject: sbin: Use socklen_t in a few places.
X-Git-Tag: v3.7.0~535
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d70f9514c0b72fd9106719d2f58c6702a0ce2620

sbin: Use socklen_t in a few places.
---

diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index 44d223893f..dc4b606b71 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -1769,7 +1769,7 @@ static void
 get_local_ip ( int s, long *aval )
 {
 	char			intf_name[IFNAMSIZ];
-	int			namelen = IFNAMSIZ;
+	socklen_t		namelen = IFNAMSIZ;
 	struct air_netif_rsp	*net_info = NULL;
 	struct sockaddr_in	*sin;
 
diff --git a/sbin/ip6fw/ip6fw.c b/sbin/ip6fw/ip6fw.c
index 751aade7b3..0ad4d1df58 100644
--- a/sbin/ip6fw/ip6fw.c
+++ b/sbin/ip6fw/ip6fw.c
@@ -438,7 +438,8 @@ list(int ac, char **av)
 	struct ip6_fw *r, *rules, *n;
 	int l,i;
 	unsigned long rulenum;
-	int nalloc, bytes, maxbytes;
+	int nalloc, maxbytes;
+	socklen_t bytes;
 
 	/* extract rules from kernel, resizing array as necessary */
 	rules = NULL;
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index d6233c5620..625463db90 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -196,7 +196,7 @@ main(int argc, char **argv)
 	 */
 	for (;;) {
 		struct sockaddr_un un2;
-		int len2 = sizeof(un2);
+		socklen_t len2 = sizeof(un2);
 		int so2;
 		pid_t pid;
 		fd_set fdset;
diff --git a/sbin/rconfig/server.c b/sbin/rconfig/server.c
index 36fe6d90bc..8f33b81e67 100644
--- a/sbin/rconfig/server.c
+++ b/sbin/rconfig/server.c
@@ -32,8 +32,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/sbin/rconfig/server.c,v 1.4 2006/10/20 14:50:42 pavalos Exp $
  */
 
 #include "defs.h"
@@ -97,7 +95,7 @@ doServer(void)
 	    }
 	    signal(SIGCHLD, server_chld_exit);
 	    for (;;) {
-		int slen = sizeof(sain);
+		socklen_t slen = sizeof(sain);
 		fd = accept(lfd, (void *)&sain, &slen);
 		if (fd < 0) {
 		    if (errno != EINTR)
@@ -242,7 +240,7 @@ service_packet_loop(int fd)
     struct sockaddr_in sain;
     char ibuf[256+1];
     char obuf[256+1];
-    int sain_len;
+    socklen_t sain_len;
     int n;
     char *scan;
     const char *cmd;
diff --git a/sbin/rconfig/subs.c b/sbin/rconfig/subs.c
index 9915c7b286..545a45b5a5 100644
--- a/sbin/rconfig/subs.c
+++ b/sbin/rconfig/subs.c
@@ -32,8 +32,6 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
- * $DragonFly: src/sbin/rconfig/subs.c,v 1.4 2005/04/02 22:15:20 dillon Exp $
  */
 
 #include "defs.h"
@@ -84,7 +82,7 @@ udp_transact(struct sockaddr_in *sain, struct sockaddr_in *rsin, int *pfd,
     va_list va;
     int fd;
     int n;
-    int rsin_len = sizeof(*rsin);
+    socklen_t rsin_len = sizeof(*rsin);
     int rc;
     int nretry = 3;
     int timeout = 1;
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 47725d61c7..aa3d3c8f22 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -57,7 +57,8 @@ read_rip(int sock,
 {
 	struct sockaddr_in from;
 	struct interface *aifp;
-	int fromlen, cc;
+	int cc;
+	socklen_t fromlen;
 #ifdef USE_PASSIFNAME
 	static struct msg_limit  bad_name;
 	struct {
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index 44e556ff2b..6d817b842f 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -943,7 +943,8 @@ read_d(void)
 	static struct msg_limit  bad_name;
 #endif
 	struct sockaddr_in from;
-	int n, fromlen, cc, hlen;
+	int n, cc, hlen;
+	socklen_t fromlen;
 	struct {
 #ifdef USE_PASSIFNAME
 		char	ifname[IFNAMSIZ];
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index 6502e5ec91..87297b2c84 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -369,7 +369,7 @@ query_loop(char *argv[], int argc)
 	fd_set bits;
 	struct timeval now, delay;
 	struct sockaddr_in from;
-	int fromlen;
+	socklen_t fromlen;
 	MD5_CTX md5_ctx;