diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-01-28 08:04:40 +0000 | 
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-01-28 08:04:40 +0000 | 
| commit | 930105c1e9a553c4faa1364d56f79f3fbdd383fb (patch) | |
| tree | 3c45c995c4be16b325a0ec0ed6294d455330232a /lib/libfetch/ftp.c | |
| parent | 2abcaf6bfde0f065761937417dcb07f1094d1875 (diff) | |
Notes
Diffstat (limited to 'lib/libfetch/ftp.c')
| -rw-r--r-- | lib/libfetch/ftp.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c index 37878bd0c0af..56d0bf572ce3 100644 --- a/lib/libfetch/ftp.c +++ b/lib/libfetch/ftp.c @@ -434,7 +434,7 @@ _ftp_setup(conn_t *cconn, conn_t *dconn, int mode)  	if (cconn == NULL || dconn == NULL)  		return (NULL); -	if ((io = malloc(sizeof *io)) == NULL) +	if ((io = malloc(sizeof(*io))) == NULL)  		return (NULL);  	io->cconn = cconn;  	io->dconn = dconn; @@ -473,7 +473,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file,  		    strncasecmp(s, "no", 2) != 0);  	/* find our own address, bind, and listen */ -	l = sizeof sa; +	l = sizeof(sa);  	if (getsockname(conn->sd, (struct sockaddr *)&sa, &l) == -1)  		goto sysouch;  	if (sa.ss_family == AF_INET6) @@ -559,7 +559,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file,  				goto sysouch;  		/* construct sockaddr for data socket */ -		l = sizeof sa; +		l = sizeof(sa);  		if (getpeername(conn->sd, (struct sockaddr *)&sa, &l) == -1)  			goto sysouch;  		if (sa.ss_family == AF_INET6) @@ -622,7 +622,7 @@ _ftp_transfer(conn_t *conn, const char *oper, const char *file,  			((struct sockaddr_in *)&sa)->sin_port = 0;  			arg = low ? IP_PORTRANGE_DEFAULT : IP_PORTRANGE_HIGH;  			if (setsockopt(sd, IPPROTO_IP, IP_PORTRANGE, -				(char *)&arg, sizeof arg) == -1) +				(char *)&arg, sizeof(arg)) == -1)  				goto sysouch;  			break;  		} @@ -756,7 +756,7 @@ _ftp_authenticate(conn_t *conn, struct url *url, struct url *purl)  				len = 0;  			else if (len > MAXLOGNAME)  				len = MAXLOGNAME; -			gethostname(pbuf + len, sizeof pbuf - len); +			gethostname(pbuf + len, sizeof(pbuf) - len);  			pwd = pbuf;  		}  		e = _ftp_cmd(conn, "PASS %s", pwd); @@ -881,7 +881,7 @@ _ftp_cached_connect(struct url *url, struct url *purl, const char *flags)  	if (cached_connection)  		_ftp_disconnect(cached_connection);  	cached_connection = _fetch_ref(conn); -	memcpy(&cached_host, url, sizeof *url); +	memcpy(&cached_host, url, sizeof(*url));  	return (conn);  }  | 
