From d336388403e89f9c3ce7f5e0db564fe9fd4e1952 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 19 Jan 2005 20:10:53 +0000
Subject: [PATCH] Got rid of delete_one() since we can (and do) use the updated
 delete_file() call now.

---
 receiver.c | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/receiver.c b/receiver.c
index 10673ca8..88552f4b 100644
--- a/receiver.c
+++ b/receiver.c
@@ -57,29 +57,6 @@ extern int inplace;
 extern struct exclude_list_struct server_exclude_list;
 
 
-static void delete_one(char *fn, int is_dir)
-{
-	if (!is_dir) {
-		if (robust_unlink(fn) != 0) {
-			rsyserr(FERROR, errno, "delete_one: unlink %s failed",
-				full_fname(fn));
-		} else if (verbose)
-			rprintf(FINFO, "deleting %s\n", safe_fname(fn));
-	} else {
-		if (do_rmdir(fn) != 0) {
-			if (errno != ENOTEMPTY && errno != EEXIST) {
-				rsyserr(FERROR, errno,
-					"delete_one: rmdir %s failed",
-					full_fname(fn));
-			}
-		} else if (verbose) {
-			rprintf(FINFO, "deleting directory %s\n",
-				safe_fname(fn));
-		}
-	}
-}
-
-
 static int is_backup_file(char *fn)
 {
 	int k = strlen(fn) - backup_suffix_len;
@@ -132,8 +109,10 @@ void delete_files(struct file_list *flist)
 						rprintf(FINFO, "deleting %s\n",
 							safe_fname(f));
 					}
-				} else
-					delete_one(f, S_ISDIR(mode) != 0);
+				} else {
+					delete_file(f, S_ISDIR(mode)
+					    ? DEL_DIR | DEL_NO_RECURSE : 0);
+				}
 				deletion_count++;
 			}
 		}
-- 
2.34.1