From a8789a85c715b26a3baefed6ac314dffd7605719 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 3 Sep 2025 16:00:06 +0300 Subject: [PATCH] doveadm: Move doveadm_is_killed() to doveadm-util --- src/doveadm/doveadm-mail.c | 5 ----- src/doveadm/doveadm-util.c | 5 +++++ src/doveadm/doveadm-util.h | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index 3ddb353db1..3e5b461bfb 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -47,11 +47,6 @@ struct doveadm_mail_cmd_module_register doveadm_mail_cmd_module_register = { 0 }; char doveadm_mail_cmd_hide = '\0'; -bool doveadm_is_killed(void) -{ - return master_service_is_killed(master_service); -} - void doveadm_mail_failed_error(struct doveadm_mail_cmd_context *ctx, enum mail_error error) { diff --git a/src/doveadm/doveadm-util.c b/src/doveadm/doveadm-util.c index c21dbee6c0..d8a3cd42bf 100644 --- a/src/doveadm/doveadm-util.c +++ b/src/doveadm/doveadm-util.c @@ -195,6 +195,11 @@ int doveadm_blocking_connect(const char *path, return ret; } +bool doveadm_is_killed(void) +{ + return master_service_is_killed(master_service); +} + int i_strccdascmp(const char *a, const char *b) { while(*a != '\0' && *b != '\0') { diff --git a/src/doveadm/doveadm-util.h b/src/doveadm/doveadm-util.h index 21802b1255..953aba1abb 100644 --- a/src/doveadm/doveadm-util.h +++ b/src/doveadm/doveadm-util.h @@ -20,6 +20,8 @@ int doveadm_blocking_connect(const char *path, struct istream **input_r, struct ostream **output_r, const char **error_r); +bool doveadm_is_killed(void); + void doveadm_load_modules(void); void doveadm_unload_modules(void); bool doveadm_has_unloaded_plugin(const char *name); -- 2.47.3