From: Daniel P. Berrangé Date: Wed, 5 Jan 2022 13:49:36 +0000 (+0000) Subject: ui: avoid compiler warnings from unused clipboard info variable X-Git-Tag: v7.0.0-rc0~83^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70a54b01693eda3c61814b05d699aba41015ac48;p=thirdparty%2Fqemu.git ui: avoid compiler warnings from unused clipboard info variable With latest clang 13.0.0 we get ../ui/clipboard.c:47:34: error: variable 'old' set but not used [-Werror,-Wunused-but-set-variable] g_autoptr(QemuClipboardInfo) old = NULL; ^ The compiler can't tell that we only declared this variable in order to get the side effect of free'ing it when out of scope. This pattern is a little dubious for a use of g_autoptr, so rewrite the code to avoid it. Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé [AJB: fix merge conflict] Signed-off-by: Alex Bennée Message-Id: <20211215141949.3512719-2-berrange@redhat.com> Message-Id: <20220105135009.1584676-2-alex.bennee@linaro.org> --- diff --git a/ui/clipboard.c b/ui/clipboard.c index 82572ea1169..5f15cf853d0 100644 --- a/ui/clipboard.c +++ b/ui/clipboard.c @@ -62,13 +62,11 @@ void qemu_clipboard_update(QemuClipboardInfo *info) .type = QEMU_CLIPBOARD_UPDATE_INFO, .info = info, }; - g_autoptr(QemuClipboardInfo) old = NULL; - assert(info->selection < QEMU_CLIPBOARD_SELECTION__COUNT); notifier_list_notify(&clipboard_notifiers, ¬ify); - old = cbinfo[info->selection]; + qemu_clipboard_info_unref(cbinfo[info->selection]); cbinfo[info->selection] = qemu_clipboard_info_ref(info); }