From 6dfc00411292aa3220b33b6ac9553907e3933b0f Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Thu, 10 Oct 2019 12:22:49 +0200 Subject: [PATCH] gdb/testsuite: Fix typos in infcall-nested-structs.c Some of the comparison functions in infcall-nested-structs.c contain redundant comparisons like a. == a. instead of a. == b.. They were introduced with this commit: 36eb4c5f9bbe6 - "infcall-nested-structs: Test up to five fields" Fix the redundant comparisons. gdb/testsuite/ChangeLog: * gdb.base/infcall-nested-structs.c (cmp_struct_02_01) (cmp_struct_02_02, cmp_struct_04_01, cmp_struct_04_02) (cmp_struct_05_01, cmp_struct_static_02_01) (cmp_struct_static_04_01, cmp_struct_static_06_01): Fix redundant comparisons. --- gdb/testsuite/ChangeLog | 8 ++++++++ .../gdb.base/infcall-nested-structs.c | 20 +++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index aa57a8532b9..2ea7ffbc4d9 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2019-10-10 Andreas Arnez + + * gdb.base/infcall-nested-structs.c (cmp_struct_02_01) + (cmp_struct_02_02, cmp_struct_04_01, cmp_struct_04_02) + (cmp_struct_05_01, cmp_struct_static_02_01) + (cmp_struct_static_04_01, cmp_struct_static_06_01): Fix redundant + comparisons. + 2019-10-10 Tom de Vries PR testsuite/24888 diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.c b/gdb/testsuite/gdb.base/infcall-nested-structs.c index b6f793e7a33..795ab4a3f91 100644 --- a/gdb/testsuite/gdb.base/infcall-nested-structs.c +++ b/gdb/testsuite/gdb.base/infcall-nested-structs.c @@ -141,7 +141,7 @@ int cmp_struct_01_04 (struct struct_01_04 a, struct struct_01_04 b) { return a.a == b.a; } int cmp_struct_02_01 (struct struct_02_01 a, struct struct_02_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b; } +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } int cmp_struct_02_02 (struct struct_02_02 a, struct struct_02_02 b) { return a.a == b.a && a.b == b.b; } @@ -153,8 +153,8 @@ int cmp_struct_02_04 (struct struct_02_04 a, struct struct_02_04 b) { return a.a == b.a && a.b == b.b; } int cmp_struct_04_01 (struct struct_04_01 a, struct struct_04_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b - && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == a.s2.s1.d; } +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b + && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } int cmp_struct_04_02 (struct struct_04_02 a, struct struct_04_02 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } @@ -167,8 +167,8 @@ int cmp_struct_04_04 (struct struct_04_04 a, struct struct_04_04 b) { return a.a == b.a && a.b == b.b && a.c == b.c && a.d == b.d; } int cmp_struct_05_01 (struct struct_05_01 a, struct struct_05_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b - && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == a.s2.s1.d +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b + && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e; } int cmp_struct_05_02 (struct struct_05_02 a, struct struct_05_02 b) @@ -187,7 +187,7 @@ int cmp_struct_05_04 (struct struct_05_04 a, struct struct_05_04 b) int cmp_struct_static_02_01 (struct struct_static_02_01 a, struct struct_static_02_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b; } +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b; } int cmp_struct_static_02_02 (struct struct_static_02_02 a, @@ -207,8 +207,8 @@ cmp_struct_static_02_04 (struct struct_static_02_04 a, int cmp_struct_static_04_01 (struct struct_static_04_01 a, struct struct_static_04_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b - && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == a.s2.s1.d; } +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b + && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d; } int cmp_struct_static_04_02 (struct struct_static_04_02 a, @@ -229,8 +229,8 @@ cmp_struct_static_04_04 (struct struct_static_04_04 a, int cmp_struct_static_06_01 (struct struct_static_06_01 a, struct struct_static_06_01 b) -{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == a.s2.s1.b - && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == a.s2.s1.d +{ return a.s2.s1.a == b.s2.s1.a && a.s2.s1.b == b.s2.s1.b + && a.s2.s1.c == b.s2.s1.c && a.s2.s1.d == b.s2.s1.d && a.s2.s1.e == b.s2.s1.e && a.f == b.f; } int -- 2.30.2