From 3064501543977e16e568772b80bace62afce3287 Mon Sep 17 00:00:00 2001 From: Klemek Date: Wed, 24 Sep 2025 15:37:50 +0200 Subject: [PATCH] refactor includes --- .github/workflows/ci.yml | 2 +- Makefile.dev | 23 +++++++++++++++++++++-- src/args.c | 12 +++++++----- src/args.h | 2 +- src/bmp.c | 4 +++- src/generator.c | 19 ++++++++++--------- src/generator.h | 2 +- src/main.c | 3 ++- src/rand.c | 2 ++ src/types.h | 6 ++---- 10 files changed, 50 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2419ea..6104369 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,5 +44,5 @@ jobs: - uses: actions/checkout@v4 - name: gcc run: mkdir -p build && gcc $GCC_ARGS -o build/$TARGET - - name: $TARGET + - name: run program run: ./build/$TARGET $TEST_ARGS diff --git a/Makefile.dev b/Makefile.dev index e14ba20..d873bdd 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -9,7 +9,7 @@ clean: build: @mkdir -p build - gcc -v -Wall -Wextra src/*.c src/*.h -o build/$(TARGET) + gcc -Wall -Wextra src/*.c src/*.h -o build/$(TARGET) -g .PHONY: install install: build @@ -47,7 +47,26 @@ release: clean Makefile.in \ missing \ src/.* \ - src/*.o \ + src/*.o + +.PHONY: release +release-clean: + @rm -rf \ + autom4te.cache \ + aclocal.m4 \ + compile \ + config.* \ + configure \ + depcomp \ + $(TARGET) \ + $(TARGET)-*.tar.gz \ + $(TARGET)-*.pkg.tar.zst \ + install-sh \ + Makefile \ + Makefile.in \ + missing \ + src/.* \ + src/*.o .PHONY: release-arch release-arch: clean diff --git a/src/args.c b/src/args.c index 14c906d..7561703 100644 --- a/src/args.c +++ b/src/args.c @@ -1,12 +1,14 @@ -#include "args.h" -#include "config.h" -#include "rand.h" #include #include #include #include #include +#include "args.h" +#include "config.h" +#include "rand.h" +#include "types.h" + void print_help(int status_code) { puts(PACKAGE " " VERSION "\n\n" @@ -118,8 +120,8 @@ void parse_color(char *arg, char *value, unsigned char color[3]) { color[2] = parse_char(arg, tmp); } -parameters parse_args(int argc, char **argv) { - parameters params; +Parameters parse_args(int argc, char **argv) { + Parameters params; params.quiet = false; params.seed = (unsigned long)time(NULL); diff --git a/src/args.h b/src/args.h index bb1dd73..85774b7 100644 --- a/src/args.h +++ b/src/args.h @@ -3,6 +3,6 @@ #ifndef ARGS_H #define ARGS_H -parameters parse_args(int argc, char **argv); +Parameters parse_args(int argc, char **argv); #endif \ No newline at end of file diff --git a/src/bmp.c b/src/bmp.c index bf70359..52a2987 100644 --- a/src/bmp.c +++ b/src/bmp.c @@ -1,7 +1,9 @@ -#include "bmp.h" #include #include +#include "bmp.h" +#include "types.h" + #define HEADER_SIZE 54 void write_str(unsigned char *buffer, unsigned int offset, unsigned int size, diff --git a/src/generator.c b/src/generator.c index 9d56dd1..394c857 100644 --- a/src/generator.c +++ b/src/generator.c @@ -1,14 +1,15 @@ -#include "args.h" -#include "bmp.h" -#include "config.h" -#include "rand.h" #include #include #include +#include "args.h" +#include "bmp.h" +#include "config.h" +#include "rand.h" + #define BMP_COLOR_DEPTH 3 -parameters global_params; +Parameters global_params; float slope; unsigned char color_depth; unsigned int line_width; @@ -53,7 +54,7 @@ void generate_bmp_line(unsigned short y, unsigned char *data_buffer, } } -void debug_parameters(parameters params) { +void debug_parameters(Parameters params) { if (!params.quiet) { printf(" output %s\n", params.file_path); printf(" seed %ld\n", params.seed); @@ -74,7 +75,7 @@ void debug_parameters(parameters params) { } } -void init(parameters params) { +void init(Parameters params) { global_params = params; slope = ((float)params.slope) / 255.0; color_depth = params.monochrome ? 1 : 3; @@ -94,14 +95,14 @@ void clean() { free(current_line); } -void print_time(parameters params, clock_t start) { +void print_time(Parameters params, clock_t start) { if (!params.quiet) { clock_t now = clock(); printf("time: %.3fs\n", (float)(now - start) / CLOCKS_PER_SEC); } } -void generate(parameters params) { +void generate(Parameters params) { if (!params.quiet) { puts(PACKAGE " " VERSION); } diff --git a/src/generator.h b/src/generator.h index 49712c2..62af778 100644 --- a/src/generator.h +++ b/src/generator.h @@ -3,6 +3,6 @@ #ifndef GENERATOR_H #define GENERATOR_H -void generate(parameters params); +void generate(Parameters params); #endif \ No newline at end of file diff --git a/src/main.c b/src/main.c index f35de5c..872ef47 100644 --- a/src/main.c +++ b/src/main.c @@ -1,8 +1,9 @@ #include "args.h" #include "generator.h" +#include "types.h" int main(int argc, char **argv) { - parameters params; + Parameters params; params = parse_args(argc, argv); generate(params); return 0; diff --git a/src/rand.c b/src/rand.c index aabfa46..09a8a24 100644 --- a/src/rand.c +++ b/src/rand.c @@ -1,3 +1,5 @@ +#include "rand.h" + static unsigned long long mcg_state = 0xcafef00dd15ea5e5u; // Must be odd static unsigned long long const multiplier = 6364136223846793005u; diff --git a/src/types.h b/src/types.h index 8f9c83c..bb482a6 100644 --- a/src/types.h +++ b/src/types.h @@ -3,7 +3,7 @@ #ifndef TYPES_H #define TYPES_H -struct Parameters { +typedef struct Parameters { bool quiet; bool monochrome; unsigned long seed; @@ -15,9 +15,7 @@ struct Parameters { unsigned char start[3]; unsigned char var[3]; unsigned char rotation; -}; - -typedef struct Parameters parameters; +} Parameters; typedef void line_fn(unsigned short y, unsigned char *data_buffer, unsigned int len);