From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 28 Oct 2022 09:58:56 +0000 (+0300)
Subject: dsync: Remove unnecessary DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG
X-Git-Tag: 2.4.0~3467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3387c1ab043bfd20ff08909b4ff67260ca897da0;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Remove unnecessary DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG

The debug status comes from the parent event.
---

diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree.c b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
index f9a8d0a452..b26afc263e 100644
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
@@ -385,8 +385,7 @@ static void dsync_brain_mailbox_trees_sync(struct dsync_brain *brain)
 	struct dsync_mailbox_tree_sync_ctx *ctx;
 	const struct dsync_mailbox_tree_sync_change *change;
 	enum dsync_mailbox_trees_sync_type sync_type;
-	enum dsync_mailbox_trees_sync_flags sync_flags =
-		(brain->debug ? DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG : 0);
+	enum dsync_mailbox_trees_sync_flags sync_flags = 0;
 	int ret;
 
 	if (brain->no_backup_overwrite)
diff --git a/src/doveadm/dsync/dsync-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
index dee5a06977..3b21764663 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-sync.c
@@ -1400,9 +1400,7 @@ dsync_mailbox_trees_sync_init(struct dsync_mailbox_tree *local_tree,
 	ctx->sync_type = sync_type;
 	ctx->sync_flags = sync_flags;
 
-	bool force_debug = (ctx->sync_flags & DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG) != 0;
 	ctx->event = event_create(parent_event);
-	event_set_forced_debug(ctx->event, force_debug);
 	i_array_init(&ctx->changes, 128);
 
 again:
diff --git a/src/doveadm/dsync/dsync-mailbox-tree.h b/src/doveadm/dsync/dsync-mailbox-tree.h
index dc921052ce..310c4864ce 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree.h
+++ b/src/doveadm/dsync/dsync-mailbox-tree.h
@@ -17,8 +17,6 @@ enum dsync_mailbox_trees_sync_type {
 };
 
 enum dsync_mailbox_trees_sync_flags {
-	/* Enable debugging */
-	DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG		= 0x01,
 	/* Disable mailbox renaming logic. This is just a kludge that should
 	   be removed once the renaming logic has no more bugs.. */
 	DSYNC_MAILBOX_TREES_SYNC_FLAG_NO_RENAMES	= 0x04
diff --git a/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c b/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
index 6b3770812a..62b48e288a 100644
--- a/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/test-dsync-mailbox-tree-sync.c
@@ -194,8 +194,7 @@ static void test_trees_nofree(struct dsync_mailbox_tree *tree1,
 	dsync_mailbox_tree_build_guid_hash(tree2, &dup_node1, &dup_node2);
 	ctx = dsync_mailbox_trees_sync_init(tree1, tree2,
 					    DSYNC_MAILBOX_TREES_SYNC_TYPE_TWOWAY,
-					    DSYNC_MAILBOX_TREES_SYNC_FLAG_DEBUG,
-					    event);
+					    0, event);
 	while (dsync_mailbox_trees_sync_next(ctx) != NULL) {
 	}
 	dsync_mailbox_trees_sync_deinit(&ctx);