From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Tue, 18 Jul 2023 10:31:09 +0000 (+0000)
Subject: fts-flatcurve: fts_flatcurve_build_query_arg_term() - Use move constructor when available
X-Git-Tag: 2.4.0~2632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c71659eb25b9af0f170ca54243afd5364eea684d;p=thirdparty%2Fdovecot%2Fcore.git

fts-flatcurve: fts_flatcurve_build_query_arg_term() - Use move constructor when available

Found by coverity
---

diff --git a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
index c7a8655570..36f3f031cf 100644
--- a/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
+++ b/src/plugins/fts-flatcurve/fts-backend-flatcurve-xapian.cc
@@ -27,6 +27,12 @@ extern "C" {
 #  include <xapian.h>
 #pragma GCC diagnostic pop
 
+#ifdef XAPIAN_MOVE_SEMANTICS
+#  define std_move(x) std::move(x)
+#else
+#  define std_move(x) x
+#endif
+
 #include <algorithm>
 #include <sstream>
 #include <string>
@@ -2034,7 +2040,7 @@ fts_flatcurve_build_query_arg_term(struct flatcurve_fts_query *query,
 				  Xapian::Query::MatchAll, q);
 
 	if (x->query == NULL)
-		x->query = new Xapian::Query(q);
+		x->query = new Xapian::Query(std_move(q));
 	else {
 		oldq = x->query;
 		x->query = new Xapian::Query(op, *(x->query), q);