From 6309b241cdd6e6f312528aa459c08d635d836588 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Thu, 24 Jul 2025 15:42:55 -0400 Subject: [PATCH] Fix some clang-tidy warnings in unit test --- tests/api.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/api.c b/tests/api.c index 7190f1812..e81283f58 100644 --- a/tests/api.c +++ b/tests/api.c @@ -18325,17 +18325,16 @@ static int test_wc_PKCS7_GetEnvelopedDataKariRid(void) size_t i; const word32 ridKeyIdentifierOffset = 4; - cmsFile = XFOPEN("./certs/test/kari-keyid-cms.msg", "rb"); - ExpectTrue(cmsFile != XBADFILE); - cmsSz = (word32)XFREAD(cms, 1, sizeof(cms), cmsFile); - ExpectTrue(cmsSz > 0); + ExpectTrue((cmsFile = XFOPEN("./certs/test/kari-keyid-cms.msg", "rb")) + != XBADFILE); + ExpectTrue((cmsSz = (word32)XFREAD(cms, 1, sizeof(cms), cmsFile)) > 0); if (cmsFile != XBADFILE) XFCLOSE(cmsFile); - skiHexFile = XFOPEN("./certs/test/client-ecc-cert-ski.hex", "rb"); - ExpectTrue(skiHexFile != XBADFILE); - skiHexSz = (word32)XFREAD(skiHex, 1, sizeof(skiHex), skiHexFile); - ExpectTrue(skiHexSz > 0); + ExpectTrue((skiHexFile = XFOPEN("./certs/test/client-ecc-cert-ski.hex", + "rb")) != XBADFILE); + ExpectTrue((skiHexSz = (word32)XFREAD(skiHex, 1, sizeof(skiHex), + skiHexFile)) > 0); if (skiHexFile != XBADFILE) XFCLOSE(skiHexFile);