diff --git a/libutils/mutex.c b/libutils/mutex.c index 8fce168a..14d17aef 100644 --- a/libutils/mutex.c +++ b/libutils/mutex.c @@ -41,7 +41,7 @@ void __ThreadLock(pthread_mutex_t *mutex, fprintf(stderr, "Locking failure at %s:%d function %s! " "(pthread_mutex_lock: %s)", - filename, lineno, funcname, GetErrorStrFromCode(result)); + filename, lineno, funcname, strerror(result)); fflush(stdout); fflush(stderr); DoCleanupAndExit(101); @@ -60,7 +60,7 @@ void __ThreadUnlock(pthread_mutex_t *mutex, fprintf(stderr, "Locking failure at %s:%d function %s! " "(pthread_mutex_unlock: %s)", - filename, lineno, funcname, GetErrorStrFromCode(result)); + filename, lineno, funcname, strerror(result)); fflush(stdout); fflush(stderr); DoCleanupAndExit(101); @@ -92,7 +92,7 @@ int __ThreadWait(pthread_cond_t *pcond, pthread_mutex_t *mutex, int timeout, Log(LOG_LEVEL_DEBUG, "Thread condition timed out at %s:%d function %s! " "(pthread_cond_timewait): %s)", - filename, lineno, funcname, GetErrorStrFromCode(result)); + filename, lineno, funcname, strerror(result)); } else { @@ -101,7 +101,7 @@ int __ThreadWait(pthread_cond_t *pcond, pthread_mutex_t *mutex, int timeout, fprintf(stderr, "Failed to wait for thread condition at %s:%d function " "%s! (pthread_cond_(wait|timewait)): %s)", - filename, lineno, funcname, GetErrorStrFromCode(result)); + filename, lineno, funcname, strerror(result)); fflush(stdout); fflush(stderr); DoCleanupAndExit(101); diff --git a/libutils/sequence.c b/libutils/sequence.c index 633a6521..2cce4274 100644 --- a/libutils/sequence.c +++ b/libutils/sequence.c @@ -27,7 +27,7 @@ static const size_t EXPAND_FACTOR = 2; -Seq *SeqNew(size_t initialCapacity, void (ItemDestroy) (void *item)) +Seq *(SeqNew)(size_t initialCapacity, void (ItemDestroy) (void *item)) { Seq *seq = xmalloc(sizeof(Seq)); diff --git a/libutils/sequence.h b/libutils/sequence.h index 3b4fb19e..fdd9ad00 100644 --- a/libutils/sequence.h +++ b/libutils/sequence.h @@ -75,7 +75,12 @@ size_t SeqLength(const Seq *seq); @param [in] ItemDestroy Optional item destructor to clean up memory when needed. @return A pointer to the created Sequence */ -Seq *SeqNew(size_t initial_capacity, void (*ItemDestroy) ()); +Seq *SeqNew(size_t initial_capacity, void (*ItemDestroy) (void *item)); +/* Cast so callers may pass a destroyer taking a typed pointer, e.g. + * JsonDestroy(JsonElement *). The old 'void (*ItemDestroy) ()' prototype + * meant 'unspecified arguments' before C23, but means '(void)' in C23. */ +#define SeqNew(initial_capacity, ItemDestroy) \ + SeqNew((initial_capacity), (void (*)(void *)) (ItemDestroy)) /** @brief Destroy an existing Sequence diff --git a/libutils/stack.c b/libutils/stack.c index e665e040..a9df7d3e 100644 --- a/libutils/stack.c +++ b/libutils/stack.c @@ -26,7 +26,7 @@ #include #include -Stack *StackNew(size_t initial_capacity, void (ItemDestroy) (void *item)) +Stack *(StackNew)(size_t initial_capacity, void (ItemDestroy) (void *item)) { Stack *stack = xmalloc(sizeof(Stack)); diff --git a/libutils/stack.h b/libutils/stack.h index fed5e81f..b7c84621 100644 --- a/libutils/stack.h +++ b/libutils/stack.h @@ -33,7 +33,10 @@ typedef struct Stack_ Stack; @param [in] initial_capacity Initial capacity, defaults to 1. @param [in] ItemDestroy Function used to destroy data elements. */ -Stack *StackNew(size_t initial_capacity, void (*ItemDestroy) ()); +Stack *StackNew(size_t initial_capacity, void (*ItemDestroy) (void *item)); +/* Cast so callers may pass a destroyer taking a typed pointer (see SeqNew). */ +#define StackNew(initial_capacity, ItemDestroy) \ + StackNew((initial_capacity), (void (*)(void *)) (ItemDestroy)) /** @brief Destroys the stack and frees the memory it occupies. diff --git a/libutils/threaded_queue.c b/libutils/threaded_queue.c index 1eaba82f..302f33a0 100644 --- a/libutils/threaded_queue.c +++ b/libutils/threaded_queue.c @@ -73,7 +73,7 @@ ThreadedQueue *ThreadedQueueNew(size_t initial_capacity, Log(LOG_LEVEL_ERR, "Failed to use error-checking mutexes for queue, " "falling back to normal ones (pthread_mutexattr_settype: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); } @@ -83,7 +83,7 @@ ThreadedQueue *ThreadedQueueNew(size_t initial_capacity, { Log(LOG_LEVEL_ERR, "Failed to initialize mutex (pthread_mutex_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); pthread_mutexattr_destroy(&attr); free(queue->lock); free(queue); @@ -98,7 +98,7 @@ ThreadedQueue *ThreadedQueueNew(size_t initial_capacity, { Log(LOG_LEVEL_ERR, "Failed to initialize thread condition (pthread_cond_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); free(queue->lock); free(queue->cond_non_empty); free(queue); @@ -112,7 +112,7 @@ ThreadedQueue *ThreadedQueueNew(size_t initial_capacity, Log(LOG_LEVEL_ERR, "Failed to initialize thread condition " "(pthread_cond_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); free(queue->lock); free(queue->cond_empty); free(queue->cond_non_empty); @@ -462,7 +462,7 @@ ThreadedQueue *ThreadedQueueCopy(ThreadedQueue *queue) Log(LOG_LEVEL_ERR, "Failed to use error-checking mutexes for queue, " "falling back to normal ones (pthread_mutexattr_settype: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); } @@ -472,7 +472,7 @@ ThreadedQueue *ThreadedQueueCopy(ThreadedQueue *queue) { Log(LOG_LEVEL_ERR, "Failed to initialize mutex (pthread_mutex_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); pthread_mutexattr_destroy(&attr); free(new_queue->lock); free(new_queue); @@ -486,7 +486,7 @@ ThreadedQueue *ThreadedQueueCopy(ThreadedQueue *queue) Log(LOG_LEVEL_ERR, "Failed to initialize thread condition " "(pthread_cond_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); free(new_queue->lock); free(new_queue->cond_non_empty); free(new_queue); @@ -500,7 +500,7 @@ ThreadedQueue *ThreadedQueueCopy(ThreadedQueue *queue) Log(LOG_LEVEL_ERR, "Failed to initialize thread condition " "(pthread_cond_init: %s)", - GetErrorStrFromCode(ret)); + strerror(ret)); free(new_queue->lock); free(new_queue->cond_empty); free(new_queue->cond_non_empty); diff --git a/libutils/threaded_stack.c b/libutils/threaded_stack.c index 6e745224..a282683d 100644 --- a/libutils/threaded_stack.c +++ b/libutils/threaded_stack.c @@ -44,7 +44,7 @@ struct ThreadedStack_ { pthread_mutex_t *lock; /**< Thread lock for accessing data. */ }; -ThreadedStack *ThreadedStackNew(size_t initial_capacity, void (ItemDestroy) (void *item)) +ThreadedStack *(ThreadedStackNew)(size_t initial_capacity, void (ItemDestroy) (void *item)) { ThreadedStack *stack = xmalloc(sizeof(ThreadedStack)); diff --git a/libutils/threaded_stack.h b/libutils/threaded_stack.h index 861e4d55..0704ebb4 100644 --- a/libutils/threaded_stack.h +++ b/libutils/threaded_stack.h @@ -33,7 +33,10 @@ typedef struct ThreadedStack_ ThreadedStack; @param [in] initial_capacity Initial capacity, defaults to 1. @param [in] ItemDestroy Function used to destroy data elements. */ -ThreadedStack *ThreadedStackNew(size_t initial_capacity, void (*ItemDestroy) ()); +ThreadedStack *ThreadedStackNew(size_t initial_capacity, void (*ItemDestroy) (void *item)); +/* Cast so callers may pass a destroyer taking a typed pointer (see SeqNew). */ +#define ThreadedStackNew(initial_capacity, ItemDestroy) \ + ThreadedStackNew((initial_capacity), (void (*)(void *)) (ItemDestroy)) /** @brief Destroys the stack and frees the memory it occupies. diff --git a/tests/unit/json_test.c b/tests/unit/json_test.c index 200478a8..306ec233 100644 --- a/tests/unit/json_test.c +++ b/tests/unit/json_test.c @@ -2425,7 +2425,7 @@ static void test_json_get_type_as_string() } { - JsonElement *element = JsonNullCreate(true); + JsonElement *element = JsonNullCreate(); const char *expected = "null"; const char *actual = JsonGetTypeAsString(element); assert_string_equal(expected, actual);