From bf6f87e726c7e585402575a0976c717c6edd9817 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 14 May 2016 05:51:28 -0700 Subject: [PATCH] Remove redundant sizeof on EXPECTED_VIEW_LENGTH PR ld/20097 * testplug2.c (onall_symbols_read): Remove redundant sizeof on EXPECTED_VIEW_LENGTH. * testplug4.c (onall_symbols_read): Likewise. --- ld/ChangeLog | 7 +++++++ ld/testplug2.c | 2 +- ld/testplug4.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 13f8c0b1a3b..291c751b04d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2016-05-14 H.J. Lu + + PR ld/20097 + * testplug2.c (onall_symbols_read): Remove redundant sizeof + on EXPECTED_VIEW_LENGTH. + * testplug4.c (onall_symbols_read): Likewise. + 2016-05-13 H.J. Lu PR ld/20093 diff --git a/ld/testplug2.c b/ld/testplug2.c index 5e346436833..5dc4e78b8fa 100644 --- a/ld/testplug2.c +++ b/ld/testplug2.c @@ -602,7 +602,7 @@ onall_symbols_read (void) #define EXPECTED_VIEW "/* The first line of this file must match the expectation of" #define EXPECTED_VIEW_LENGTH (sizeof (EXPECTED_VIEW) - 1) if (file.filesize != SIZE_OF_FUNC_C - || SIZE_OF_FUNC_C < sizeof EXPECTED_VIEW_LENGTH + || SIZE_OF_FUNC_C < EXPECTED_VIEW_LENGTH || memcmp (view, EXPECTED_VIEW, EXPECTED_VIEW_LENGTH) != 0) { char result[EXPECTED_VIEW_LENGTH + 1]; diff --git a/ld/testplug4.c b/ld/testplug4.c index fe7665aea3f..86bad65cba6 100644 --- a/ld/testplug4.c +++ b/ld/testplug4.c @@ -608,7 +608,7 @@ onall_symbols_read (void) #define EXPECTED_VIEW "/* The first line of this file must match the expectation of" #define EXPECTED_VIEW_LENGTH (sizeof (EXPECTED_VIEW) - 1) if (file.filesize != SIZE_OF_PR20070B_C - || SIZE_OF_PR20070B_C < sizeof EXPECTED_VIEW_LENGTH + || SIZE_OF_PR20070B_C < EXPECTED_VIEW_LENGTH || memcmp (view, EXPECTED_VIEW, EXPECTED_VIEW_LENGTH) != 0) { char result[EXPECTED_VIEW_LENGTH + 1]; -- 2.30.2