X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6dff599288f7781d7b3a2ec8df758341690c4197..8f3f8eec08624e538e98f43a3157f3d9a0c41c79:/generator.c

diff --git a/generator.c b/generator.c
index 0a9d3f5c..de5e2bbc 100644
--- a/generator.c
+++ b/generator.c
@@ -43,7 +43,6 @@ extern int protocol_version;
 extern int always_checksum;
 extern char *compare_dest;
 extern int link_dest;
-extern struct file_struct **hlink_list;
 
 
 /* choose whether to skip a particular file */
@@ -102,7 +101,7 @@ void write_sum_head(int f, struct sum_struct *sum)
 {
 	static struct sum_struct null_sum;
 
-	if (sum == (struct sum_struct *)NULL)
+	if (sum == NULL)
 		sum = &null_sum;
 
 	write_int(f, sum->count);
@@ -408,7 +407,7 @@ void recv_generator(char *fname, struct file_struct *file, int i, int f_out)
 
 	fnamecmp = fname;
 
-	if ((statret == -1) && (compare_dest != NULL)) {
+	if (statret == -1 && compare_dest != NULL) {
 		/* try the file at compare_dest instead */
 		int saveerrno = errno;
 		pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, compare_dest, fname);
@@ -530,9 +529,10 @@ void generate_files(int f, struct file_list *flist, char *local_name)
 	int phase=0;
 	char fbuf[MAXPATHLEN];
 
-	if (verbose > 2)
-		rprintf(FINFO,"generator starting pid=%d count=%d\n",
-			(int)getpid(),flist->count);
+	if (verbose > 2) {
+		rprintf(FINFO, "generator starting pid=%ld count=%d\n",
+			(long)getpid(), flist->count);
+	}
 
 	if (verbose >= 2) {
 		rprintf(FINFO,