From d112a3d9033204a76f8e4c751a6e27015bbb9c24 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 21 Jun 2024 00:50:47 +0200
Subject: [PATCH] lib-sieve-tool: sieve-tool - Use tool as main parameter to
sieve_tool_script_compile/open()
---
src/lib-sieve-tool/sieve-tool.c | 8 +++++---
src/lib-sieve-tool/sieve-tool.h | 6 +++---
src/sieve-tools/sieve-filter.c | 4 ++--
src/sieve-tools/sieve-test.c | 9 +++++----
src/sieve-tools/sievec.c | 4 ++--
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index 74e40ab60..6957ed782 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -578,9 +578,10 @@ struct ostream *sieve_tool_open_output_stream(const char *filename)
*/
struct sieve_binary *
-sieve_tool_script_compile(struct sieve_instance *svinst,
- const char *filename, const char *name)
+sieve_tool_script_compile(struct sieve_tool *tool, const char *filename,
+ const char *name)
{
+ struct sieve_instance *svinst = tool->svinst;
struct sieve_error_handler *ehandler;
struct sieve_binary *sbin;
@@ -597,8 +598,9 @@ sieve_tool_script_compile(struct sieve_instance *svinst,
}
struct sieve_binary *
-sieve_tool_script_open(struct sieve_instance *svinst, const char *filename)
+sieve_tool_script_open(struct sieve_tool *tool, const char *filename)
{
+ struct sieve_instance *svinst = tool->svinst;
struct sieve_error_handler *ehandler;
struct sieve_binary *sbin;
diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h
index bf2f96557..e7457cb18 100644
--- a/src/lib-sieve-tool/sieve-tool.h
+++ b/src/lib-sieve-tool/sieve-tool.h
@@ -85,10 +85,10 @@ struct ostream *sieve_tool_open_output_stream(const char *filename);
*/
struct sieve_binary *
-sieve_tool_script_compile(struct sieve_instance *svinst,
- const char *filename, const char *name);
+sieve_tool_script_compile(struct sieve_tool *tool, const char *filename,
+ const char *name);
struct sieve_binary *
-sieve_tool_script_open(struct sieve_instance *svinst, const char *filename);
+sieve_tool_script_open(struct sieve_tool *tool, const char *filename);
void sieve_tool_dump_binary_to(struct sieve_binary *sbin,
const char *filename, bool hexdump);
diff --git a/src/sieve-tools/sieve-filter.c b/src/sieve-tools/sieve-filter.c
index 8b4a78ac9..df5f200cf 100644
--- a/src/sieve-tools/sieve-filter.c
+++ b/src/sieve-tools/sieve-filter.c
@@ -525,11 +525,11 @@ int main(int argc, char **argv)
/* Compile main sieve script */
if (force_compile) {
- main_sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+ main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
if (main_sbin != NULL)
(void)sieve_save(main_sbin, TRUE, NULL);
} else {
- main_sbin = sieve_tool_script_open(svinst, scriptfile);
+ main_sbin = sieve_tool_script_open(sieve_tool, scriptfile);
}
/* Initialize mail user */
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index 023b7acde..19ed53b3e 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -296,11 +296,11 @@ int main(int argc, char **argv)
/* Compile main sieve script */
if (force_compile) {
- main_sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+ main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
if (main_sbin != NULL)
(void)sieve_save(main_sbin, TRUE, NULL);
} else {
- main_sbin = sieve_tool_script_open(svinst, scriptfile);
+ main_sbin = sieve_tool_script_open(sieve_tool, scriptfile);
}
if (main_sbin == NULL) {
@@ -415,11 +415,12 @@ int main(int argc, char **argv)
/* Compile sieve script */
if (force_compile) {
sbin = sieve_tool_script_compile(
- svinst, sfiles[i], sfiles[i]);
+ sieve_tool, sfiles[i], sfiles[i]);
if (sbin != NULL)
(void)sieve_save(sbin, FALSE, NULL);
} else {
- sbin = sieve_tool_script_open(svinst, sfiles[i]);
+ sbin = sieve_tool_script_open(
+ sieve_tool, sfiles[i]);
}
if (sbin == NULL) {
diff --git a/src/sieve-tools/sievec.c b/src/sieve-tools/sievec.c
index b22a94a90..91d2ecc2f 100644
--- a/src/sieve-tools/sievec.c
+++ b/src/sieve-tools/sievec.c
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
else
file = t_strconcat(scriptfile, "/", dp->d_name, NULL);
- sbin = sieve_tool_script_compile(svinst, file, NULL);
+ sbin = sieve_tool_script_compile(sieve_tool, file, NULL);
if (sbin != NULL) {
sieve_save(sbin, TRUE, NULL);
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
NOTE: For consistency, stat errors are handled here as well
*/
- sbin = sieve_tool_script_compile(svinst, scriptfile, NULL);
+ sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL);
if (sbin != NULL) {
if (dump)
sieve_tool_dump_binary_to(sbin, outfile, FALSE);
--
GitLab