49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
From c761dac5d72f0d7c4643125e0611c75334b4ec4e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 21 Oct 2024 15:58:54 +0800
|
||
|
|
Subject: [PATCH] ui: remove break after g_assert_not_reached()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from b3372e0ec818d7747963a2ec7ae04fd1a8152afd
|
||
|
|
|
||
|
|
Use of assert(false) can trip spurious control flow warnings from
|
||
|
|
some versions of GCC (i.e. using -fsanitize=thread with gcc-12):
|
||
|
|
|
||
|
|
error: control reaches end of non-void function [-Werror=return-type]
|
||
|
|
default:
|
||
|
|
g_assert_not_reached();
|
||
|
|
break;
|
||
|
|
| ^^^^^
|
||
|
|
|
||
|
|
Solve that by removing the unreachable 'break' statement, unifying
|
||
|
|
the code base on g_assert_not_reached() instead.
|
||
|
|
|
||
|
|
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
|
||
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Message-ID: <20240910221606.1817478-37-pierrick.bouvier@linaro.org>
|
||
|
|
[PMD: Add description suggested by Eric Blake]
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
ui/qemu-pixman.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
|
||
|
|
index 5ca55dd199..6cada8b45e 100644
|
||
|
|
--- a/ui/qemu-pixman.c
|
||
|
|
+++ b/ui/qemu-pixman.c
|
||
|
|
@@ -49,7 +49,6 @@ PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format)
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
g_assert_not_reached();
|
||
|
|
- break;
|
||
|
|
}
|
||
|
|
|
||
|
|
pf.amax = (1 << pf.abits) - 1;
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|