This patch fix the following gcc warnings:
warning: ISO C90 forbids mixed declarations and code
[-Wdeclaration-after-statement] [..]
igt_color_encoding.c:45:2: warning: ISO C90 forbids mixed declarations
and code [-Wdeclaration-after-statement] [..]
igt_color_encoding.c: In function ‘ycbcr_to_rgb_matrix’:
igt_color_encoding.c:72:2: warning: ISO C90 forbids mixed declarations
and code [-Wdeclaration-after-statement] [..]
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx>
---
lib/igt_color_encoding.c | 16 ++++++----------
tests/kms_frontbuffer_tracking.c | 2 +-
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/lib/igt_color_encoding.c b/lib/igt_color_encoding.c
index b1648a74..1a89bb46 100644
--- a/lib/igt_color_encoding.c
+++ b/lib/igt_color_encoding.c
@@ -36,11 +36,9 @@ static const struct color_encoding color_encodings[IGT_NUM_COLOR_ENCODINGS] = {
static struct igt_mat4 rgb_to_ycbcr_matrix(const struct color_encoding *e)
{
- float kr, kg, kb;
-
- kr = e->kr;
- kb = e->kb;
- kg = 1.0f - kr - kb;
+ float kr = e->kr;
+ float kb = e->kb;
+ float kg = 1.0f - kr - kb;
struct igt_mat4 ret = {
.d[0 * 4 + 0] = kr,
@@ -63,11 +61,9 @@ static struct igt_mat4 rgb_to_ycbcr_matrix(const struct color_encoding *e)
static struct igt_mat4 ycbcr_to_rgb_matrix(const struct color_encoding *e)
{
- float kr, kg, kb;
-
- kr = e->kr;
- kb = e->kb;
- kg = 1.0f - kr - kb;
+ float kr = e->kr;
+ float kb = e->kb;
+ float kg = 1.0f - kr - kb;
struct igt_mat4 ret = {
.d[0 * 4 + 0] = 1.0f,
diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c
index 8754cc46..dbb8ba62 100644
--- a/tests/kms_frontbuffer_tracking.c
+++ b/tests/kms_frontbuffer_tracking.c
@@ -1770,8 +1770,8 @@ static void do_status_assertions(int flags)
static void __do_assertions(const struct test_mode *t, int flags,
int line)
{
- flags = adjust_assertion_flags(t, flags);
bool mandatory_sink_crc = t->feature & FEATURE_PSR;
+ flags = adjust_assertion_flags(t, flags);
igt_debug("checking asserts in line %i\n", line);
--
2.17.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
