X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d58911fb37252f7cf593aee482556fbbf4f75c92..c1f62a573a8351dbc663467e744800935c7574d5:/socket.c

diff --git a/socket.c b/socket.c
index 23292cd5..870e7601 100644
--- a/socket.c
+++ b/socket.c
@@ -443,7 +443,7 @@ char *client_addr(int fd)
 {
 	struct sockaddr sa;
 	struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
-	int     length = sizeof(sa);
+	socklen_t length = sizeof(sa);
 	static char addr_buf[100];
 	static int initialised;
 
@@ -496,7 +496,7 @@ char *client_name(int fd)
 	hp = gethostbyname(name_buf);
 	if (!hp) {
 		strcpy (name_buf,def);
-		rprint (FERROR, "reverse name lookup for \"%s\" failed\n",
+		rprintf (FERROR, "reverse name lookup for \"%s\" failed\n",
 			name_buf);
 	} else {
 		for (p=hp->h_addr_list;*p;p++) {
@@ -525,7 +525,10 @@ struct in_addr *ip_address(const char *str)
 	static struct in_addr ret;
 	struct hostent *hp;
 
-	assert (str);
+	if (!str) {
+		rprintf (FERROR, "ip_address received NULL name\n");
+		return NULL;
+	}
 
 	/* try as an IP address */
 	if (inet_aton(str, &ret) != 0) {