From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 9 Feb 2023 07:38:17 +0000 (+0100)
Subject: remote_driver: Work around broken clang
X-Git-Tag: v9.1.0-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4cf477701bb87510822ea17bb5d634a20203d5f;p=thirdparty%2Flibvirt.git

remote_driver: Work around broken clang

In recent commit of v9.0.0-191-gc71c159248 I've introduced
remoteConnectFormatURI() function and in the function @query
variable. Even though, the variable is used, clang-13 fails to
see it. Surprisingly, newer clang is not affected. Fortunately,
swapping the order in which variables are set makes clang happy
again.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 58cd0abe8c..a4c60be3d7 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -712,7 +712,7 @@ remoteConnectFormatURI(virURI *uri,
         virURIParamsSetIgnore(uri, false, names);
     }
 
-    query = tmpuri.query = virURIFormatParams(uri);
+    tmpuri.query = query = virURIFormatParams(uri);
 
     ret = virURIFormat(&tmpuri);