From 36bbc55cc605e505742338c604badc52c114bc50 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 11 Oct 2024 20:15:58 +0200
Subject: [PATCH] lib-sieve: sieve-extensions - Move sieve_extension_reload()
---
src/lib-sieve/sieve-extensions.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index e0872af07..c1d553b09 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -342,21 +342,6 @@ static void sieve_extension_registry_deinit(struct sieve_instance *svinst)
hash_table_destroy(&ext_reg->extension_index);
}
-bool sieve_extension_reload(const struct sieve_extension *ext)
-{
- struct sieve_extension_registry *ext_reg = ext->svinst->ext_reg;
- struct sieve_extension *const *mod_ext;
- int ext_id = ext->id;
-
- /* Let's not just cast the 'const' away */
- if (ext_id >= 0 && ext_id < (int) array_count(&ext_reg->extensions)) {
- mod_ext = array_idx(&ext_reg->extensions, ext_id);
-
- return _sieve_extension_load(*mod_ext);
- }
- return FALSE;
-}
-
static struct sieve_extension *
sieve_extension_lookup(struct sieve_instance *svinst, const char *name)
{
@@ -490,6 +475,21 @@ sieve_extension_require(struct sieve_instance *svinst,
return ext;
}
+bool sieve_extension_reload(const struct sieve_extension *ext)
+{
+ struct sieve_extension_registry *ext_reg = ext->svinst->ext_reg;
+ struct sieve_extension *const *mod_ext;
+ int ext_id = ext->id;
+
+ /* Let's not just cast the 'const' away */
+ if (ext_id >= 0 && ext_id < (int) array_count(&ext_reg->extensions)) {
+ mod_ext = array_idx(&ext_reg->extensions, ext_id);
+
+ return _sieve_extension_load(*mod_ext);
+ }
+ return FALSE;
+}
+
const struct sieve_extension *
sieve_extension_replace(struct sieve_instance *svinst,
const struct sieve_extension_def *extdef, bool load)
--
GitLab