Refactor variable declarations for improved clarity and consistency in multiple source files

This commit is contained in:
2025-10-01 02:39:37 +01:00
parent a7434322ea
commit a1b3b5db92
10 changed files with 97 additions and 141 deletions

View File

@@ -28,13 +28,13 @@ extern "C"
{
uint32_t localHashInt = CRC32_ISO_SEED;
uint32_t localTable[256];
int i, j;
int i;
for(i = 0; i < 256; i++)
{
uint32_t entry = (uint32_t)i;
for(j = 0; j < 8; j++)
for(int j = 0; j < 8; j++)
if((entry & 1) == 1)
entry = (entry >> 1) ^ CRC32_ISO_POLY;
else

View File

@@ -74,36 +74,30 @@ TEST_F(flacFixture, flac)
TEST_F(flacFixture, flacCompress)
{
size_t original_len = 9633792;
uint cmp_len = original_len;
uint decmp_len = original_len;
char path[PATH_MAX];
char filename[PATH_MAX * 2];
FILE *file;
uint32_t original_crc, decmp_crc;
uint8_t *original;
uint8_t *cmp_buffer;
uint8_t *decmp_buffer;
size_t newSize;
size_t original_len = 9633792;
uint cmp_len = original_len;
uint decmp_len = original_len;
char path[PATH_MAX];
char filename[PATH_MAX * 2];
// Allocate buffers
original = static_cast<uint8_t *>(malloc(original_len));
cmp_buffer = static_cast<uint8_t *>(malloc(cmp_len));
decmp_buffer = static_cast<uint8_t *>(malloc(decmp_len));
uint8_t *original = static_cast<uint8_t *>(malloc(original_len));
uint8_t *cmp_buffer = static_cast<uint8_t *>(malloc(cmp_len));
uint8_t *decmp_buffer = static_cast<uint8_t *>(malloc(decmp_len));
// Read the file
getcwd(path, PATH_MAX);
snprintf(filename, PATH_MAX, "%s/data/audio.bin", path);
file = fopen(filename, "rb");
FILE *file = fopen(filename, "rb");
fread(original, 1, original_len, file);
fclose(file);
// Calculate the CRC
original_crc = crc32_data(original, original_len);
uint32_t original_crc = crc32_data(original, original_len);
// Compress
newSize = aaruf_flac_encode_redbook_buffer(
size_t newSize = aaruf_flac_encode_redbook_buffer(
cmp_buffer, cmp_len, original, original_len, 4608, 1, 0, "partial_tukey(0/1.0/1.0)", 12, 0, 1, false, 0, 8,
"Aaru.Compression.Native.Tests", strlen("Aaru.Compression.Native.Tests"));
cmp_len = newSize;
@@ -114,7 +108,7 @@ TEST_F(flacFixture, flacCompress)
EXPECT_EQ(decmp_len, original_len);
decmp_crc = crc32_data(decmp_buffer, decmp_len);
uint32_t decmp_crc = crc32_data(decmp_buffer, decmp_len);
// Free buffers
free(original);

View File

@@ -77,39 +77,33 @@ TEST_F(lzmaFixture, lzma)
TEST_F(lzmaFixture, lzmaCompress)
{
size_t original_len = 8388608;
size_t cmp_len = original_len;
size_t decmp_len = original_len;
char path[PATH_MAX];
char filename[PATH_MAX * 2];
FILE *file;
uint32_t original_crc, decmp_crc;
uint8_t *original;
uint8_t *cmp_buffer;
uint8_t *decmp_buffer;
int err;
uint8_t props[5];
size_t props_len = 5;
size_t original_len = 8388608;
size_t cmp_len = original_len;
size_t decmp_len = original_len;
char path[PATH_MAX];
char filename[PATH_MAX * 2];
uint8_t props[5];
size_t props_len = 5;
// Allocate buffers
original = static_cast<uint8_t *>(malloc(original_len));
cmp_buffer = static_cast<uint8_t *>(malloc(cmp_len));
decmp_buffer = static_cast<uint8_t *>(malloc(decmp_len));
uint8_t *original = static_cast<uint8_t *>(malloc(original_len));
uint8_t *cmp_buffer = static_cast<uint8_t *>(malloc(cmp_len));
uint8_t *decmp_buffer = static_cast<uint8_t *>(malloc(decmp_len));
// Read the file
getcwd(path, PATH_MAX);
snprintf(filename, PATH_MAX, "%s/data/data.bin", path);
file = fopen(filename, "rb");
FILE *file = fopen(filename, "rb");
fread(original, 1, original_len, file);
fclose(file);
// Calculate the CRC
original_crc = crc32_data(original, original_len);
uint32_t original_crc = crc32_data(original, original_len);
// Compress
err = aaruf_lzma_encode_buffer(cmp_buffer, &cmp_len, original, original_len, props, &props_len, 9, 1048576, 3, 0, 2,
273, 2);
int err = aaruf_lzma_encode_buffer(cmp_buffer, &cmp_len, original, original_len, props, &props_len, 9, 1048576, 3,
0, 2, 273, 2);
EXPECT_EQ(err, 0);
// Decompress
@@ -118,7 +112,7 @@ TEST_F(lzmaFixture, lzmaCompress)
EXPECT_EQ(decmp_len, original_len);
decmp_crc = crc32_data(decmp_buffer, decmp_len);
uint32_t decmp_crc = crc32_data(decmp_buffer, decmp_len);
// Free buffers
free(original);

View File

@@ -66,15 +66,13 @@ protected:
TEST_F(sha256Fixture, sha256)
{
SHA256_CTX *ctx;
unsigned char hash[SHA256_DIGEST_LENGTH];
int ret;
ctx = static_cast<SHA256_CTX *>(malloc(sizeof(SHA256_CTX)));
SHA256_CTX *ctx = static_cast<SHA256_CTX *>(malloc(sizeof(SHA256_CTX)));
EXPECT_NE(nullptr, ctx);
ret = SHA256_Init(ctx);
int ret = SHA256_Init(ctx);
EXPECT_EQ(ret, 1);