From 8149e9031f117823e90f85256b3fd26804728ea0 Mon Sep 17 00:00:00 2001 From: Matteo Golin Date: Tue, 11 Jun 2024 18:20:09 -0400 Subject: [PATCH] Formatting --- src/collectors/lsm6dso32_clctr.c | 4 ++-- src/collectors/pac195x_clctr.c | 4 ++-- src/collectors/sht41_clctr.c | 2 +- src/collectors/sysclock_clctr.c | 4 ++-- src/main.c | 9 ++++----- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/collectors/lsm6dso32_clctr.c b/src/collectors/lsm6dso32_clctr.c index 1b31c93..1aa6514 100644 --- a/src/collectors/lsm6dso32_clctr.c +++ b/src/collectors/lsm6dso32_clctr.c @@ -1,7 +1,7 @@ #include "../drivers/lsm6dso32/lsm6dso32.h" #include "../drivers/sensor_api.h" -#include "collectors.h" #include "../logging-utils/logging.h" +#include "collectors.h" #include #define return_err(err) return (void *)((uint64_t)errno) @@ -17,7 +17,7 @@ void *lsm6dso32_collector(void *args) { mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY); if (sensor_q == -1) { log_print(stderr, LOG_ERROR, "LSM6DSO32 collector could not open message queue '%s': '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); return_err(err); } diff --git a/src/collectors/pac195x_clctr.c b/src/collectors/pac195x_clctr.c index fc085ec..0332e4d 100644 --- a/src/collectors/pac195x_clctr.c +++ b/src/collectors/pac195x_clctr.c @@ -1,6 +1,6 @@ +#include "../logging-utils/logging.h" #include "collectors.h" #include "drivers/pac195x/pac195x.h" -#include "../logging-utils/logging.h" #include /** Macro to early return errors. */ @@ -15,7 +15,7 @@ void *pac1952_2_collector(void *args) { mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY); if (sensor_q == -1) { log_print(stderr, LOG_ERROR, "PAC195X collector could not open message queue '%s': '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); return_err(err); } diff --git a/src/collectors/sht41_clctr.c b/src/collectors/sht41_clctr.c index d6099ea..cd077f3 100644 --- a/src/collectors/sht41_clctr.c +++ b/src/collectors/sht41_clctr.c @@ -20,7 +20,7 @@ void *sht41_collector(void *args) { mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY); if (sensor_q == -1) { log_print(stderr, LOG_ERROR, "SHT41 collector could not open message queue '%s': '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); return (void *)((uint64_t)errno); } diff --git a/src/collectors/sysclock_clctr.c b/src/collectors/sysclock_clctr.c index 99ad4c2..fdd96e5 100644 --- a/src/collectors/sysclock_clctr.c +++ b/src/collectors/sysclock_clctr.c @@ -1,6 +1,6 @@ #include "../drivers/sensor_api.h" -#include "collectors.h" #include "../logging-utils/logging.h" +#include "collectors.h" #include #include #include @@ -22,7 +22,7 @@ void *sysclock_collector(void *args) { mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_WRONLY); if (sensor_q == -1) { log_print(stderr, LOG_ERROR, "Sysclock collector could not open message queue '%s': '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); return (void *)((uint64_t)errno); } diff --git a/src/main.c b/src/main.c index b50b368..2f8e3f1 100644 --- a/src/main.c +++ b/src/main.c @@ -4,11 +4,11 @@ * * The main function for the fetcher module, where program logic is used to create a console application. */ +#include "../logging-utils/logging.h" #include "board-id/board_id.h" #include "collectors/collectors.h" #include "drivers/m24c0x/m24c0x.h" #include "drivers/sensor_api.h" -#include "../logging-utils/logging.h" #include #include #include @@ -106,7 +106,7 @@ int main(int argc, char **argv) { mqd_t sensor_q = mq_open(SENSOR_QUEUE, O_CREAT | O_RDONLY, S_IWOTH | S_IRUSR, &q_attr); if (sensor_q == -1) { log_print(stderr, LOG_ERROR, "Could not create internal queue '%s' with error: '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); exit(EXIT_FAILURE); } @@ -114,7 +114,7 @@ int main(int argc, char **argv) { struct mq_attr sensor_q_attr; if (mq_getattr(sensor_q, &sensor_q_attr) == -1) { log_print(stderr, LOG_ERROR, "Failed to get attributes of message queue '%s': '%s'", SENSOR_QUEUE, - strerror(errno)); + strerror(errno)); exit(EXIT_FAILURE); } @@ -208,8 +208,7 @@ int main(int argc, char **argv) { while (print_output) { if (mq_receive(sensor_q, (char *)&recv_msg, sensor_q_attr.mq_msgsize, NULL) == -1) { // Handle error without exiting - log_print(stderr, LOG_ERROR, "Failed to receive message on queue '%s': %s", SENSOR_QUEUE, - strerror(errno)); + log_print(stderr, LOG_ERROR, "Failed to receive message on queue '%s': %s", SENSOR_QUEUE, strerror(errno)); continue; } // Successfully received data, print it to output stream