From b73a8c55df47931ab7fc7c4bf4289884c58583bf Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Mon, 4 Sep 2023 16:58:28 +0200 Subject: [PATCH 1/3] types: remove some duplicated error codes (#939) --- include/re_types.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/include/re_types.h b/include/re_types.h index cbef418dd..a3c4dba56 100644 --- a/include/re_types.h +++ b/include/re_types.h @@ -147,21 +147,6 @@ typedef SSIZE_T ssize_t; #define ENODATA 200 #endif -/** Protocol error */ -#ifndef EPROTO -#define EPROTO 201 -#endif - -/** Not a data message */ -#ifndef EBADMSG -#define EBADMSG 202 -#endif - -/** Value too large for defined data type */ -#ifndef EOVERFLOW -#define EOVERFLOW 203 -#endif - /** Accessing a corrupted shared library */ #ifndef ELIBBAD #define ELIBBAD 204 From 84208bc390c0f205c38764812815acdb14d301b2 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Mon, 4 Sep 2023 17:03:00 +0200 Subject: [PATCH 2/3] test: minor improvements in remain test (#931) --- test/remain.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/remain.c b/test/remain.c index 9294b87f9..cc22212bc 100644 --- a/test/remain.c +++ b/test/remain.c @@ -42,6 +42,7 @@ static void tmr_handler(void *arg) mtx_unlock(data->mutex); + /* Stop re_main loop */ re_cancel(); } @@ -56,11 +57,12 @@ static int thread_handler(void *arg) tmr_init(&tmr); + /* Add a worker thread for this thread */ err = re_thread_init(); if (err) { DEBUG_WARNING("re thread init: %m\n", err); data->err = err; - return 0; + return err; } #ifndef WIN32 @@ -80,22 +82,21 @@ static int thread_handler(void *arg) data->err = err; tmr_cancel(&tmr); - /* cleanup */ tmr_debug(); + + /* Remove the worker thread for this thread */ re_thread_close(); data->thread_exited = true; - return 0; + return err; } static int test_remain_thread(void) { - struct data data; - int i, err; - - memset(&data, 0, sizeof(data)); + struct data data = { 0 }; + int err; err = mutex_alloc(&data.mutex); if (err) @@ -105,7 +106,7 @@ static int test_remain_thread(void) TEST_ERR(err); /* wait for timer to be called */ - for (i=0; i<500; i++) { + for (size_t i=0; i<500; i++) { mtx_lock(data.mutex); if (data.tmr_called || data.err) { From 9f69a23449b0a7b26f16977dbc15889b3ad2274c Mon Sep 17 00:00:00 2001 From: Sebastian Reimers Date: Wed, 6 Sep 2023 16:01:53 +0200 Subject: [PATCH 3/3] dbg: remove unused functions (#941) --- include/re_dbg.h | 4 --- src/dbg/dbg.c | 68 ------------------------------------------------ 2 files changed, 72 deletions(-) diff --git a/include/re_dbg.h b/include/re_dbg.h index 3c5b816f0..8ab1e9370 100644 --- a/include/re_dbg.h +++ b/include/re_dbg.h @@ -117,10 +117,6 @@ void dbg_close(void); int dbg_logfile_set(const char *name); void dbg_handler_set(dbg_print_h *ph, void *arg); void dbg_printf(int level, const char *fmt, ...); -void dbg_noprintf(const char *fmt, ...); -void dbg_warning(const char *fmt, ...); -void dbg_notice(const char *fmt, ...); -void dbg_info(const char *fmt, ...); const char *dbg_level_str(int level); #ifdef __cplusplus diff --git a/src/dbg/dbg.c b/src/dbg/dbg.c index 57ee7019c..e7a19ea84 100644 --- a/src/dbg/dbg.c +++ b/src/dbg/dbg.c @@ -235,74 +235,6 @@ void dbg_printf(int level, const char *fmt, ...) } -/** - * Print a formatted debug message to /dev/null - * - * @param fmt Formatted string - */ -void dbg_noprintf(const char *fmt, ...) -{ - (void)fmt; -} - - -/** - * Print a formatted warning message - * - * @param fmt Formatted string - */ -void dbg_warning(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - dbg_vprintf(DBG_WARNING, fmt, ap); - va_end(ap); - - va_start(ap, fmt); - dbg_fmt_vprintf(DBG_WARNING, fmt, ap); - va_end(ap); -} - - -/** - * Print a formatted notice message - * - * @param fmt Formatted string - */ -void dbg_notice(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - dbg_vprintf(DBG_NOTICE, fmt, ap); - va_end(ap); - - va_start(ap, fmt); - dbg_fmt_vprintf(DBG_NOTICE, fmt, ap); - va_end(ap); -} - - -/** - * Print a formatted info message - * - * @param fmt Formatted string - */ -void dbg_info(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - dbg_vprintf(DBG_INFO, fmt, ap); - va_end(ap); - - va_start(ap, fmt); - dbg_fmt_vprintf(DBG_INFO, fmt, ap); - va_end(ap); -} - - /** * Get the name of the debug level *