From e721627c250224ab9d9f0192213fe555dfd7c432 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 28 Jul 2025 18:11:16 -0700 Subject: [PATCH] anim_diff: normalize `ok = ... && ok` statements `ok &= ...` is more common in the codebase than `ok = ... && ok` when accumulating a result while unconditionally executing functions. (`ok = ok &&` is used in cases that should short circuit.) In this case multiple checks may fail and their error messages may aid in debugging. This will also improve the formatting when clang-format is applied to the codebase. Bug: 433996651 Change-Id: Ie4e2908b857122d90f6e93f06b10cb48dc86b18e --- examples/anim_diff.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/anim_diff.c b/examples/anim_diff.c index 62cee714..75986971 100644 --- a/examples/anim_diff.c +++ b/examples/anim_diff.c @@ -137,12 +137,12 @@ static int CompareAnimatedImagePair(const AnimatedImage* const img1, const int is_multi_frame_image = (img1->num_frames > 1); uint32_t i; - ok = CompareValues(img1->canvas_width, img2->canvas_width, - "Canvas width mismatch") && ok; - ok = CompareValues(img1->canvas_height, img2->canvas_height, - "Canvas height mismatch") && ok; - ok = CompareValues(img1->num_frames, img2->num_frames, - "Frame count mismatch") && ok; + ok &= CompareValues(img1->canvas_width, img2->canvas_width, + "Canvas width mismatch"); + ok &= CompareValues(img1->canvas_height, img2->canvas_height, + "Canvas height mismatch"); + ok &= CompareValues(img1->num_frames, img2->num_frames, + "Frame count mismatch"); if (!ok) return 0; // These are fatal failures, can't proceed. if (is_multi_frame_image) { // Checks relevant for multi-frame images only. @@ -155,11 +155,10 @@ static int CompareAnimatedImagePair(const AnimatedImage* const img1, img2->format == ANIM_GIF && img2->loop_count == 65536)) { max_loop_count_workaround = 1; } - ok = (max_loop_count_workaround || - CompareValues(img1->loop_count, img2->loop_count, - "Loop count mismatch")) && ok; - ok = CompareBackgroundColor(img1->bgcolor, img2->bgcolor, - premultiply) && ok; + ok &= (max_loop_count_workaround || + CompareValues(img1->loop_count, img2->loop_count, + "Loop count mismatch")); + ok &= CompareBackgroundColor(img1->bgcolor, img2->bgcolor, premultiply); } for (i = 0; i < img1->num_frames; ++i) {