From 37044678716d242bbe9d3f79b11f79f04dcc6fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Sat, 6 Apr 2024 14:38:04 +0900 Subject: [PATCH] chore: optimize statements --- .github/workflows/test.yml | 2 +- base16384.c | 6 +++--- test/coder_test.c | 6 +++--- test/file_test.c | 16 +++------------- test/file_test.h | 10 ++++++++++ test/wrap_test.c | 16 +++------------- 6 files changed, 23 insertions(+), 33 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ced3f8f..849628b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ name: test -on: [ push ] +on: [ push, pull_request ] jobs: test: diff --git a/base16384.c b/base16384.c index 05756b2..53bff16 100644 --- a/base16384.c +++ b/base16384.c @@ -27,11 +27,11 @@ #endif #include "base16384.h" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; #ifndef _WIN32 -unsigned long get_start_ms() { +static unsigned long get_start_ms() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return (ts.tv_sec * 1000 + ts.tv_nsec / 1000000); diff --git a/test/coder_test.c b/test/coder_test.c index d20674a..de160ea 100644 --- a/test/coder_test.c +++ b/test/coder_test.c @@ -26,9 +26,9 @@ #define TEST_SIZE (4096) -char encbuf[TEST_SIZE+16]; -char decbuf[TEST_SIZE/7*8+16]; -char tstbuf[TEST_SIZE+16]; +static char encbuf[TEST_SIZE+16]; +static char decbuf[TEST_SIZE/7*8+16]; +static char tstbuf[TEST_SIZE+16]; #define loop_diff(target) \ for(i = start; i < end; i++) { \ diff --git a/test/file_test.c b/test/file_test.c index 0e69266..8910277 100644 --- a/test/file_test.c +++ b/test/file_test.c @@ -39,19 +39,9 @@ #define TEST_OUTPUT_FILENAME "file_test_output.bin" #define TEST_VALIDATE_FILENAME "file_test_validate.bin" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; -char tstbuf[BASE16384_ENCBUFSZ]; - -#define init_input_file() \ - for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ - *(int*)(&encbuf[i]) = rand(); \ - } \ - fp = fopen(TEST_INPUT_FILENAME, "wb"); \ - ok(!fp, "fopen"); \ - ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ - ok(fclose(fp), "fclose"); \ - fputs("input file created.\n", stderr); +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; +static char tstbuf[BASE16384_ENCBUFSZ]; #define test_file_detailed(flag) \ fputs("testing base16384_en/decode_file with flag "#flag"...\n", stderr); \ diff --git a/test/file_test.h b/test/file_test.h index fd97f4d..2109bd8 100644 --- a/test/file_test.h +++ b/test/file_test.h @@ -82,4 +82,14 @@ return 1; \ } +#define init_input_file() \ + for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ + *(int*)(&encbuf[i]) = rand(); \ + } \ + fp = fopen(TEST_INPUT_FILENAME, "wb"); \ + ok(!fp, "fopen"); \ + ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ + ok(fclose(fp), "fclose"); \ + fputs("input file created.\n", stderr); + #endif \ No newline at end of file diff --git a/test/wrap_test.c b/test/wrap_test.c index 2e87067..6cf84cd 100644 --- a/test/wrap_test.c +++ b/test/wrap_test.c @@ -39,19 +39,9 @@ #define TEST_OUTPUT_FILENAME "wrap_test_output.bin" #define TEST_VALIDATE_FILENAME "wrap_test_validate.bin" -char encbuf[BASE16384_ENCBUFSZ]; -char decbuf[BASE16384_DECBUFSZ]; -char tstbuf[BASE16384_ENCBUFSZ]; - -#define init_input_file() \ - for(i = 0; i < BASE16384_ENCBUFSZ; i += sizeof(int)) { \ - *(int*)(&encbuf[i]) = rand(); \ - } \ - fp = fopen(TEST_INPUT_FILENAME, "wb"); \ - ok(!fp, "fopen"); \ - ok(fwrite(encbuf, BASE16384_ENCBUFSZ, 1, fp) != 1, "fwrite"); \ - ok(fclose(fp), "fclose"); \ - fputs("input file created.\n", stderr); +static char encbuf[BASE16384_ENCBUFSZ]; +static char decbuf[BASE16384_DECBUFSZ]; +static char tstbuf[BASE16384_ENCBUFSZ]; int main() { srand(time(NULL));