From c4e08ec3777b78b6f788eec6737524cc5e856107 Mon Sep 17 00:00:00 2001 From: Thorsten Töpper Date: Sun, 31 Aug 2025 16:18:35 +0200 Subject: rename output.h to trace_macros.h --- Makefile | 12 ++++++------ include/hex_conversion.h | 2 +- include/output.h | 23 ----------------------- include/trace_macros.h | 23 +++++++++++++++++++++++ src/mem_internal_check.c | 2 +- src/split_for_sort.c | 2 +- src/tree_based_check.c | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 include/output.h create mode 100644 include/trace_macros.h diff --git a/Makefile b/Makefile index 08a3fcd..3deee66 100644 --- a/Makefile +++ b/Makefile @@ -39,24 +39,24 @@ out/debug: out # Lazy, not splitting compiler & linker calls out/mem_internal_check: out src/mem_internal_check.c \ - include/output.h include/hex_conversion.h + include/trace_macros.h include/hex_conversion.h ${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/mem_internal_check.c out/debug/mem_internal_check: out/debug src/mem_internal_check.c \ - include/output.h include/hex_conversion.h + include/trace_macros.h include/hex_conversion.h ${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/mem_internal_check.c -out/split_for_sort: out src/split_for_sort.c include/output.h +out/split_for_sort: out src/split_for_sort.c include/trace_macros.h ${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/split_for_sort.c -out/debug/split_for_sort: out/debug src/split_for_sort.c include/output.h +out/debug/split_for_sort: out/debug src/split_for_sort.c include/trace_macros.h ${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/split_for_sort.c out/tree_based_check: out src/tree_based_check.c \ - include/output.h include/hex_conversion.h + include/trace_macros.h include/hex_conversion.h ${CC} -o $@ ${CFLAGS} ${PROD_CFLAGS} src/tree_based_check.c out/debug/tree_based_check: out/debug src/tree_based_check.c \ - include/output.h include/hex_conversion.h + include/trace_macros.h include/hex_conversion.h ${CC} -o $@ ${CFLAGS} ${DEBUG_CFLAGS} src/tree_based_check.c diff --git a/include/hex_conversion.h b/include/hex_conversion.h index 483cf26..ddeb131 100644 --- a/include/hex_conversion.h +++ b/include/hex_conversion.h @@ -12,7 +12,7 @@ #include #ifdef DEBUGBUILD -#include "output.h" +#include "trace_macros.h" #endif #define ishex_macro(c) ((c>='0' && c <= '9') || (c>='A' && c <= 'F') || (c>='a' && c <= 'f')) diff --git a/include/output.h b/include/output.h deleted file mode 100644 index 366e3c4..0000000 --- a/include/output.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -/* Copyright 2025 Thorsten Töpper - * - * vim:ts=4:sw=4:expandtab - */ -#ifndef OUTPUT_H -#define OUTPUT_H - -#include - -#ifndef LOGERR -#define LOGERR(...) {fprintf(stderr, "[%s:%d] %s: ", __FILE__, __LINE__, __func__); fprintf(stderr, __VA_ARGS__);} -#endif - -#ifdef DEBUGBUILD -#define DBGTRC(...) LOGERR(__VA_ARGS__) -#else -#define DBGTRC(...) -#endif - -#endif - diff --git a/include/trace_macros.h b/include/trace_macros.h new file mode 100644 index 0000000..9fd6a73 --- /dev/null +++ b/include/trace_macros.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: Apache-2.0 */ + +/* Copyright 2025 Thorsten Töpper + * + * vim:ts=4:sw=4:expandtab + */ +#ifndef TRACE_MACROS_H +#define TRACE_MACROS_H + +#include + +#ifndef LOGERR +#define LOGERR(...) {fprintf(stderr, "[%s:%d] %s: ", __FILE__, __LINE__, __func__); fprintf(stderr, __VA_ARGS__);} +#endif + +#ifdef DEBUGBUILD +#define DBGTRC(...) LOGERR(__VA_ARGS__) +#else +#define DBGTRC(...) +#endif + +#endif + diff --git a/src/mem_internal_check.c b/src/mem_internal_check.c index 080230c..bda270e 100644 --- a/src/mem_internal_check.c +++ b/src/mem_internal_check.c @@ -22,7 +22,7 @@ #include #include -#include "output.h" +#include "trace_macros.h" #include "hex_conversion.h" #include "time_utils.h" diff --git a/src/split_for_sort.c b/src/split_for_sort.c index aa9be90..fa8e187 100644 --- a/src/split_for_sort.c +++ b/src/split_for_sort.c @@ -17,7 +17,7 @@ #include #include -#include "output.h" +#include "trace_macros.h" /* Also used for paths => at least PATH_MAX */ #define BUFFERSIZE 4096 diff --git a/src/tree_based_check.c b/src/tree_based_check.c index e999707..0cb9ea9 100644 --- a/src/tree_based_check.c +++ b/src/tree_based_check.c @@ -20,7 +20,7 @@ #include #include -#include "output.h" +#include "trace_macros.h" #include "hex_conversion.h" -- cgit v1.2.3-70-g09d2