X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/776b9d1c0084e7f1d9e26071540f349193ed534b..2b1366635dc416420ed2617260aafe17d259ae0f:/flist.c

diff --git a/flist.c b/flist.c
index b88ab8b9..ed26bb8b 100644
--- a/flist.c
+++ b/flist.c
@@ -522,7 +522,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	static gid_t gid;
 	static char lastname[MAXPATHLEN], *lastdir;
 	static int lastdir_depth, lastdir_len = -1;
-	static unsigned int del_heir_name_len = 0;
+	static unsigned int del_hier_name_len = 0;
 	static int in_del_hier = 0;
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
@@ -646,11 +646,11 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	if (S_ISDIR(mode)) {
 		if (flags & XMIT_DEL_START) {
 			in_del_hier = 1;
-			del_heir_name_len = l1 + l2;
+			del_hier_name_len = l1 + l2;
 			file->flags |= FLAG_DEL_START;
 		} else if (delete_during && in_del_hier) {
-			if (!relative_paths || (l1 >= del_heir_name_len
-			    && thisname[del_heir_name_len] == '/'))
+			if (!relative_paths || (l1 >= del_hier_name_len
+			    && thisname[del_hier_name_len] == '/'))
 				file->flags |= FLAG_DEL_START;
 			else
 				in_del_hier = 0;
@@ -1690,7 +1690,7 @@ void delete_in_dir(struct file_list *flist, char *fname)
 
 	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
 		rprintf(FINFO,
-			"IO error encountered - skipping file deletion\n");
+			"IO error encountered -- skipping file deletion\n");
 		max_delete = -1; /* avoid duplicating the above warning */
 		return;
 	}