From 79e0110e461e56750ab4683900737f1712798575 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 4 Jul 2019 10:46:46 +0200 Subject: [PATCH] adouble: remove redundant calls to ad_pack() ad_fset() calls ad_pack() anyway... Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/lib/adouble.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c index 78ef187335a..8eeeb0ed291 100644 --- a/source3/lib/adouble.c +++ b/source3/lib/adouble.c @@ -688,7 +688,6 @@ static bool ad_convert_move_reso(vfs_handle_struct *handle, size_t rforkoff; ssize_t n; int ret; - bool ok; rforklen = ad_getentrylen(ad, ADEID_RFORK); if (rforklen == 0) { @@ -727,11 +726,6 @@ static bool ad_convert_move_reso(vfs_handle_struct *handle, } ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND); - ok = ad_pack(ad); - if (!ok) { - DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name); - return false; - } ret = ad_fset(handle, ad, ad->ad_fsp); if (ret != 0) { @@ -866,12 +860,6 @@ static bool ad_convert_xattr(vfs_handle_struct *handle, ad_setentrylen(ad, ADEID_FINDERI, ADEDLEN_FINDERI); - ok = ad_pack(ad); - if (!ok) { - DBG_WARNING("ad_pack [%s] failed\n", smb_fname->base_name); - goto fail; - } - rc = ad_fset(handle, ad, ad->ad_fsp); if (rc != 0) { DBG_ERR("ad_fset on [%s] failed: %s\n", @@ -1022,7 +1010,6 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle, ssize_t nread; int cmp; int rc; - bool ok; *blank = false; @@ -1047,10 +1034,6 @@ static bool ad_convert_blank_rfork(vfs_handle_struct *handle, } ad_setentrylen(ad, ADEID_RFORK, 0); - ok = ad_pack(ad); - if (!ok) { - return false; - } rc = ad_fset(handle, ad, ad->ad_fsp); if (rc != 0) { -- 2.47.3