From 4ff9e28abc2e31dabde6d71503219b3e50d9f4e3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 27 Oct 2015 09:12:18 +0100 Subject: memtest: move error handling to end of function Move error handling out of the test code to make the actual test better visible. Signed-off-by: Sascha Hauer --- common/memtest.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/common/memtest.c b/common/memtest.c index d0a0571cf8..026fd0d48d 100644 --- a/common/memtest.c +++ b/common/memtest.c @@ -347,7 +347,7 @@ static int update_progress(resource_size_t offset) int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end) { - volatile resource_size_t *start, num_words, offset, temp, anti_pattern; + volatile resource_size_t *start, num_words, offset, pattern, expected; int ret; _start = ALIGN(_start, sizeof(resource_size_t)); @@ -389,17 +389,13 @@ int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end) if (ret) return ret; - temp = start[offset]; - if (temp != (offset + 1)) { - printf("\n"); - mem_test_report_failure("read/write", - (offset + 1), - temp, &start[offset]); - return -EIO; - } + pattern = start[offset]; + expected = offset + 1; - anti_pattern = ~(offset + 1); - start[offset] = anti_pattern; + if (pattern != expected) + goto mem_err; + + start[offset] = ~start[offset]; } /* Check each location for the inverted pattern and zero it */ @@ -408,16 +404,11 @@ int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end) if (ret) return ret; - anti_pattern = ~(offset + 1); - temp = start[offset]; + pattern = start[offset]; + expected = ~(offset + 1); - if (temp != anti_pattern) { - printf("\n"); - mem_test_report_failure("read/write", - anti_pattern, - temp, &start[offset]); - return -EIO; - } + if (pattern != expected) + goto mem_err; start[offset] = 0; } @@ -427,4 +418,10 @@ int mem_test_moving_inversions(resource_size_t _start, resource_size_t _end) printf("\n"); return 0; + +mem_err: + printf("\n"); + mem_test_report_failure("read/write", expected, pattern, &start[offset]); + + return -EIO; } -- cgit v1.2.3