diff options
| -rw-r--r-- | src/nvim/log.c | 12 | ||||
| -rw-r--r-- | src/nvim/message.c | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/nvim/log.c b/src/nvim/log.c index 0f410f7c8c..6ff1aab9a0 100644 --- a/src/nvim/log.c +++ b/src/nvim/log.c @@ -114,14 +114,6 @@ void log_unlock(void) uv_mutex_unlock(&mutex); } -static void on_log_recursive_event(void **argv) -{ - char *fn_name = argv[0]; - ptrdiff_t linenr = (ptrdiff_t)argv[1]; - siemsg("E5430: %s:%d: recursive log!", fn_name, linenr); - xfree(fn_name); -} - /// Logs a message to $NVIM_LOG_FILE. /// /// @param log_level Log level (see log.h) @@ -158,9 +150,7 @@ bool logmsg(int log_level, const char *context, const char *func_name, int line_ if (recursive) { if (!did_msg) { did_msg = true; - char *arg1 = func_name ? xstrdup(func_name) : (context ? xstrdup(context) : NULL); - // coverity[leaked_storage] - loop_schedule_deferred(&main_loop, event_create(on_log_recursive_event, 2, arg1, line_num)); + msg_schedule_semsg("E5430: %s:%d: recursive log!", func_name ? func_name : context, line_num); } g_stats.log_skip++; log_unlock(); diff --git a/src/nvim/message.c b/src/nvim/message.c index 4ae11ee135..acc3122e93 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -853,7 +853,7 @@ void msg_schedule_semsg(const char *const fmt, ...) va_end(ap); char *s = xstrdup((char *)IObuff); - multiqueue_put(main_loop.events, msg_semsg_event, 1, s); + loop_schedule_deferred(&main_loop, event_create(msg_semsg_event, 1, s)); } /// Like msg(), but truncate to a single line if p_shm contains 't', or when |