summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2005-08-05 09:58:49 +0000
committerstefanf <stefanf@FreeBSD.org>2005-08-05 09:58:49 +0000
commit364138732beb56b3891f2c0e6d9ee2ad14454362 (patch)
treedd77799943ac1dcef8d2551a6cd191b6c11ca1f0
parent404af3a8b5f464a6aeb8755af56a8d45142f5bd5 (diff)
downloadFreeBSD-src-364138732beb56b3891f2c0e6d9ee2ad14454362.zip
FreeBSD-src-364138732beb56b3891f2c0e6d9ee2ad14454362.tar.gz
Use socklen_t where appropriate.
-rw-r--r--sbin/routed/input.c5
-rw-r--r--usr.bin/rlogin/rlogin.c3
-rw-r--r--usr.bin/tftp/tftp.c4
3 files changed, 7 insertions, 5 deletions
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index 085ba95..f655346 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -55,7 +55,8 @@ read_rip(int sock,
{
struct sockaddr_in from;
struct interface *aifp;
- int fromlen, cc;
+ socklen_t fromlen;
+ int cc;
#ifdef USE_PASSIFNAME
static struct msg_limit bad_name;
struct {
@@ -80,7 +81,7 @@ read_rip(int sock,
}
if (fromlen != sizeof(struct sockaddr_in))
logbad(1,"impossible recvfrom(rip) fromlen=%d",
- fromlen);
+ (int)fromlen);
/* aifp is the "authenticated" interface via which the packet
* arrived. In fact, it is only the interface on which
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index ab99b77..ecdeabe 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -135,7 +135,8 @@ main(int argc, char *argv[])
char *host, *localname, *p, *user, term[1024];
speed_t ospeed;
struct sockaddr_storage ss;
- int i, len, len2, sslen;
+ socklen_t sslen;
+ int i, len, len2;
argoff = dflag = Dflag = 0;
one = 1;
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index bac262f..4deee1b 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -105,7 +105,7 @@ xmitfile(fd, name, mode)
volatile int size, convert;
volatile unsigned long amount;
struct sockaddr_storage from;
- int fromlen;
+ socklen_t fromlen;
FILE *file;
struct sockaddr_storage peer;
struct sockaddr_storage serv; /* valid server port number */
@@ -223,7 +223,7 @@ recvfile(fd, name, mode)
volatile int size, firsttrip;
volatile unsigned long amount;
struct sockaddr_storage from;
- int fromlen;
+ socklen_t fromlen;
FILE *file;
volatile int convert; /* true if converting crlf -> lf */
struct sockaddr_storage peer;
OpenPOWER on IntegriCloud