From 525d18a2b0bb04639100adacb359d35da8472dfc Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Wed, 9 Apr 2003 17:36:33 +0000 Subject: collaps same repeted task into 2 code paths (This used to be commit bc5d1873da187c83a1a19a7560685ed903d37455) --- source3/modules/vfs_recycle.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index d554f4bfdd..3a23e1a365 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -555,11 +555,10 @@ static int recycle_unlink(connection_struct *conn, const char *file_name) /* see if we need to recreate the original directory structure in the recycle bin */ if (recbin->keep_dir_tree == True) { asprintf(&temp_name, "%s/%s", recbin->repository, path_name); - ALLOC_CHECK(temp_name, done); } else { temp_name = strdup(recbin->repository); - ALLOC_CHECK(temp_name, done); } + ALLOC_CHECK(temp_name, done); exist = recycle_directory_exist(conn, temp_name); if (exist) { -- cgit