X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/362099a51230fd80c6d54ef6f0e72927529c8dfb..d54765c44250fdef784f1d1d540690fe246048b6:/socket.c

diff --git a/socket.c b/socket.c
index 520c3d5c..a01499eb 100644
--- a/socket.c
+++ b/socket.c
@@ -1,5 +1,7 @@
 /* -*- c-file-style: "linux" -*-
    
+   rsync -- fast file replication program
+   
    Copyright (C) 1992-2001 by Andrew Tridgell <tridge@samba.org>
    Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
    
@@ -110,7 +112,7 @@ int try_bind_local(int s,
 	bhints.ai_family = ai_family;
 	bhints.ai_socktype = ai_socktype;
 	bhints.ai_flags = AI_PASSIVE;
-	if (getaddrinfo(bind_address, NULL, &bhints, &bres_all) == -1) {
+	if ((error = getaddrinfo(bind_address, NULL, &bhints, &bres_all))) {
 		rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n",
 			bind_address, gai_strerror(error));
 		return -1;
@@ -155,7 +157,6 @@ int open_socket_out(char *host, int port, const char *bind_address,
 	int type = SOCK_STREAM;
 	int error;
 	int s;
-	int result;
 	struct addrinfo hints, *res0, *res;
 	char portbuf[10];
 	char *h;
@@ -387,7 +388,7 @@ void start_accept_loop(int port, int (*fn)(int ))
 		fd_set fds;
 		int fd;
 		struct sockaddr_storage addr;
-		int addrlen = sizeof(addr);
+		socklen_t addrlen = sizeof addr;
 
 		/* close log file before the potentially very long select so
 		   file can be trimmed by another process instead of growing
@@ -570,7 +571,7 @@ void become_daemon(void)
 char *client_addr(int fd)
 {
 	struct sockaddr_storage ss;
-	int     length = sizeof(ss);
+	socklen_t length = sizeof ss;
 	static char addr_buf[100];
 	static int initialised;
 
@@ -600,7 +601,7 @@ static int get_sockaddr_family(const struct sockaddr_storage *ss)
 char *client_name(int fd)
 {
 	struct sockaddr_storage ss;
-	int     length = sizeof(ss);
+	socklen_t length = sizeof ss;
 	static char name_buf[100];
 	static char port_buf[100];
 	char *def = "UNKNOWN";