diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c index bd5a6a4e89765b316c537fa0eb27e4eedf934ed6..be10d52dd869ba7917c9919a00672012c52f12ce 100644 --- a/src/lib-sieve-tool/sieve-tool.c +++ b/src/lib-sieve-tool/sieve-tool.c @@ -578,8 +578,7 @@ struct ostream *sieve_tool_open_output_stream(const char *filename) */ struct sieve_binary * -sieve_tool_script_compile(struct sieve_tool *tool, const char *location, - const char *name) +sieve_tool_script_compile(struct sieve_tool *tool, const char *location) { struct sieve_instance *svinst = tool->svinst; struct sieve_error_handler *ehandler; @@ -589,7 +588,7 @@ sieve_tool_script_compile(struct sieve_tool *tool, const char *location, sieve_error_handler_accept_infolog(ehandler, TRUE); sieve_error_handler_accept_debuglog(ehandler, svinst->debug); - if (sieve_compile(svinst, location, name, ehandler, 0, &sbin, NULL) < 0) + if (sieve_compile(svinst, location, NULL, ehandler, 0, &sbin, NULL) < 0) i_fatal("failed to compile sieve script '%s'", location); i_assert(sbin != NULL); diff --git a/src/lib-sieve-tool/sieve-tool.h b/src/lib-sieve-tool/sieve-tool.h index e973a9e72c5481b96a70c80964d09e29986eea5c..8c506b2ec10ab0f5f8271a2f19dbb74a155bcd0a 100644 --- a/src/lib-sieve-tool/sieve-tool.h +++ b/src/lib-sieve-tool/sieve-tool.h @@ -85,8 +85,7 @@ struct ostream *sieve_tool_open_output_stream(const char *filename); */ struct sieve_binary * -sieve_tool_script_compile(struct sieve_tool *tool, const char *location, - const char *name); +sieve_tool_script_compile(struct sieve_tool *tool, const char *location); struct sieve_binary * sieve_tool_script_open(struct sieve_tool *tool, const char *location); void sieve_tool_dump_binary_to(struct sieve_binary *sbin, diff --git a/src/sieve-tools/sieve-filter.c b/src/sieve-tools/sieve-filter.c index df5f200cfd16d3b98899831a93ebe1c03743e058..0dacacb1cfe1a77b3133d250eb74f5d73e87512b 100644 --- a/src/sieve-tools/sieve-filter.c +++ b/src/sieve-tools/sieve-filter.c @@ -525,7 +525,7 @@ int main(int argc, char **argv) /* Compile main sieve script */ if (force_compile) { - main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL); + main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile); if (main_sbin != NULL) (void)sieve_save(main_sbin, TRUE, NULL); } else { diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c index 19ed53b3e766805343a0b973f7b4b4ea3c2bd318..b2cc351b5c0c53ffceaf9b70c600d3618c89fc3e 100644 --- a/src/sieve-tools/sieve-test.c +++ b/src/sieve-tools/sieve-test.c @@ -296,7 +296,7 @@ int main(int argc, char **argv) /* Compile main sieve script */ if (force_compile) { - main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile, NULL); + main_sbin = sieve_tool_script_compile(sieve_tool, scriptfile); if (main_sbin != NULL) (void)sieve_save(main_sbin, TRUE, NULL); } else { @@ -415,7 +415,7 @@ int main(int argc, char **argv) /* Compile sieve script */ if (force_compile) { sbin = sieve_tool_script_compile( - sieve_tool, sfiles[i], sfiles[i]); + sieve_tool, sfiles[i]); if (sbin != NULL) (void)sieve_save(sbin, FALSE, NULL); } else { diff --git a/src/sieve-tools/sievec.c b/src/sieve-tools/sievec.c index 91d2ecc2fa4657e1d545217a7978b12e3c204ff8..01afa32b6b7edc56a96e9e462261d1dcf5a476bc 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(sieve_tool, file, NULL); + sbin = sieve_tool_script_compile(sieve_tool, file); 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(sieve_tool, scriptfile, NULL); + sbin = sieve_tool_script_compile(sieve_tool, scriptfile); if (sbin != NULL) { if (dump) sieve_tool_dump_binary_to(sbin, outfile, FALSE);