From 532750da74b72b77ff3eb9785bccbbcd5a5d50a7 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Tue, 16 Jun 2020 00:40:05 +0200 Subject: [PATCH] fix: logger leaking path --- CMakeLists.txt | 5 ++--- include/logger.h | 13 ++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35d40fe..7a0c7d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,10 +5,9 @@ add_executable(controller main.c) option(WIRING_PI_DEBUG "Use WiringPi Debugging Tool (OFF)" OFF) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra -Werror -Wpedantic -lwiringPi -lwiringPiDev -luuid -llmdb -g") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wpedantic -Werror -Wall -Wextra -lwiringPi -lwiringPiDev -luuid -llmdb -ffile-prefix-map=${CMAKE_SOURCE_DIR}/=/") -string(LENGTH "${CMAKE_SOURCE_DIR}/" SOURCE_PATH_SIZE) -add_definitions("-DSOURCE_PATH_SIZE=${SOURCE_PATH_SIZE}") +set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -fprofile-arcs -ftest-coverage") if(WIRING_PI_DEBUG) message("Showing wiringPi calls as debug") diff --git a/include/logger.h b/include/logger.h index 4b33561..5aff1bc 100644 --- a/include/logger.h +++ b/include/logger.h @@ -6,16 +6,15 @@ #include #include -#include void logger_log(FILE *stream, log_level_t level, const char *filename, int line, const char *func, const char *msg, ...); -#define LOG_TRACE(...) logger_log(stdout, LOG_LEVEL_TRACE, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) -#define LOG_DEBUG(...) logger_log(stdout, LOG_LEVEL_DEBUG, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) -#define LOG_INFO(...) logger_log(stdout, LOG_LEVEL_INFO , __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) -#define LOG_WARN(...) logger_log(stdout, LOG_LEVEL_WARN , __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) -#define LOG_ERROR(...) logger_log(stderr, LOG_LEVEL_ERROR, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) -#define LOG_FATAL(...) logger_log(stderr, LOG_LEVEL_FATAL, __FILENAME__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_TRACE(...) logger_log(stdout, LOG_LEVEL_TRACE, __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_DEBUG(...) logger_log(stdout, LOG_LEVEL_DEBUG, __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_INFO(...) logger_log(stdout, LOG_LEVEL_INFO , __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_WARN(...) logger_log(stdout, LOG_LEVEL_WARN , __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_ERROR(...) logger_log(stderr, LOG_LEVEL_ERROR, __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LOG_FATAL(...) logger_log(stderr, LOG_LEVEL_FATAL, __FILE__, __LINE__, __func__, ##__VA_ARGS__) #endif //CONTROLLER_LOGGER_H