diff --git a/src/lib-sieve/storage/dict/sieve-dict-script.c b/src/lib-sieve/storage/dict/sieve-dict-script.c
index ea20e782d3b3b3e7d8ab8f5e2f821ddcf21c644b..b4641f9d601fa80bc4461996bdc16ee2a2fa9b45 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-script.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-script.c
@@ -61,7 +61,8 @@ static void sieve_dict_script_destroy(struct sieve_script *script)
}
static int
-sieve_dict_script_open(struct sieve_script *script, enum sieve_error *error_r)
+sieve_dict_script_open(struct sieve_script *script,
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script *dscript = (struct sieve_dict_script *)script;
struct sieve_storage *storage = script->storage;
@@ -71,7 +72,8 @@ sieve_dict_script_open(struct sieve_script *script, enum sieve_error *error_r)
const char *path, *data_id, *error;
int ret;
- if (sieve_dict_storage_get_dict(dstorage, &dscript->dict, error_r) < 0)
+ if (sieve_dict_storage_get_dict(dstorage, &dscript->dict,
+ error_code_r) < 0)
return -1;
path = t_strconcat(DICT_SIEVE_NAME_PATH,
@@ -87,14 +89,14 @@ sieve_dict_script_open(struct sieve_script *script, enum sieve_error *error_r)
sieve_script_set_critical(script,
"Failed to lookup script id from path %s: %s",
path, error);
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
} else {
e_debug(script->event,
"Script '%s' not found at path %s", name, path);
sieve_script_set_error(script, SIEVE_ERROR_NOT_FOUND,
"Sieve script '%s' not found",
name);
- *error_r = SIEVE_ERROR_NOT_FOUND;
+ *error_code_r = SIEVE_ERROR_NOT_FOUND;
}
return -1;
}
@@ -106,7 +108,7 @@ sieve_dict_script_open(struct sieve_script *script, enum sieve_error *error_r)
static int
sieve_dict_script_get_stream(struct sieve_script *script,
struct istream **stream_r,
- enum sieve_error *error_r)
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script *dscript = (struct sieve_dict_script *)script;
struct sieve_dict_storage *dstorage =
@@ -136,7 +138,7 @@ sieve_dict_script_get_stream(struct sieve_script *script,
"Data with id '%s' for script '%s' not found at path %s",
dscript->data_id, name, path);
}
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
}
@@ -218,7 +220,7 @@ sieve_dict_script_get_binpath(struct sieve_dict_script *dscript)
static struct sieve_binary *
sieve_dict_script_binary_load(struct sieve_script *script,
- enum sieve_error *error_r)
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script *dscript = (struct sieve_dict_script *)script;
@@ -226,13 +228,13 @@ sieve_dict_script_binary_load(struct sieve_script *script,
return NULL;
return sieve_binary_open(script->storage->svinst, dscript->binpath,
- script, error_r);
+ script, error_code_r);
}
static int
sieve_dict_script_binary_save(struct sieve_script *script,
struct sieve_binary *sbin, bool update,
- enum sieve_error *error_r)
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script *dscript = (struct sieve_dict_script *)script;
@@ -241,7 +243,8 @@ sieve_dict_script_binary_save(struct sieve_script *script,
if (sieve_storage_setup_bindir(script->storage, 0700) < 0)
return -1;
- return sieve_binary_save(sbin, dscript->binpath, update, 0600, error_r);
+ return sieve_binary_save(sbin, dscript->binpath, update, 0600,
+ error_code_r);
}
static bool
@@ -290,12 +293,12 @@ struct sieve_dict_script_sequence {
struct sieve_script_sequence *
sieve_dict_storage_get_script_sequence(struct sieve_storage *storage,
- enum sieve_error *error_r)
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script_sequence *dseq = NULL;
- if (error_r != NULL)
- *error_r = SIEVE_ERROR_NONE;
+ if (error_code_r != NULL)
+ *error_code_r = SIEVE_ERROR_NONE;
/* Create sequence object */
dseq = i_new(struct sieve_dict_script_sequence, 1);
@@ -306,7 +309,7 @@ sieve_dict_storage_get_script_sequence(struct sieve_storage *storage,
struct sieve_script *
sieve_dict_script_sequence_next(struct sieve_script_sequence *seq,
- enum sieve_error *error_r)
+ enum sieve_error *error_code_r)
{
struct sieve_dict_script_sequence *dseq =
(struct sieve_dict_script_sequence *)seq;
@@ -314,15 +317,15 @@ sieve_dict_script_sequence_next(struct sieve_script_sequence *seq,
(struct sieve_dict_storage *)seq->storage;
struct sieve_dict_script *dscript;
- if (error_r != NULL)
- *error_r = SIEVE_ERROR_NONE;
+ if (error_code_r != NULL)
+ *error_code_r = SIEVE_ERROR_NONE;
if (dseq->done)
return NULL;
dseq->done = TRUE;
dscript = sieve_dict_script_init(dstorage, seq->storage->script_name);
- if (sieve_script_open(&dscript->script, error_r) < 0) {
+ if (sieve_script_open(&dscript->script, error_code_r) < 0) {
struct sieve_script *script = &dscript->script;
sieve_script_unref(&script);
diff --git a/src/lib-sieve/storage/dict/sieve-dict-storage.c b/src/lib-sieve/storage/dict/sieve-dict-storage.c
index 4ac82cfd17e9e12d46eb6369bebe21345a672b28..5cff6f0fcfc5b18da58ce0b1440dbfa8e555b35e 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-storage.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-storage.c
@@ -28,7 +28,8 @@ static struct sieve_storage *sieve_dict_storage_alloc(void)
static int
sieve_dict_storage_init(struct sieve_storage *storage,
- const char *const *options, enum sieve_error *error_r)
+ const char *const *options,
+ enum sieve_error *error_code_r)
{
struct sieve_dict_storage *dstorage =
(struct sieve_dict_storage *)storage;
@@ -45,7 +46,7 @@ sieve_dict_storage_init(struct sieve_storage *storage,
} else {
sieve_storage_set_critical(
storage, "Invalid option '%s'", option);
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
}
@@ -57,7 +58,7 @@ sieve_dict_storage_init(struct sieve_storage *storage,
if (svinst->username == NULL) {
sieve_storage_set_critical(storage,
"No username specified");
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
}
username = svinst->username;
@@ -67,7 +68,7 @@ sieve_dict_storage_init(struct sieve_storage *storage,
sieve_storage_set_critical(
storage,
"BUG: Sieve interpreter is initialized without a base_dir");
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
}
@@ -85,7 +86,8 @@ sieve_dict_storage_init(struct sieve_storage *storage,
int
sieve_dict_storage_get_dict(struct sieve_dict_storage *dstorage,
- struct dict **dict_r, enum sieve_error *error_r)
+ struct dict **dict_r,
+ enum sieve_error *error_code_r)
{
struct sieve_storage *storage = &dstorage->storage;
struct sieve_instance *svinst = storage->svinst;
@@ -102,7 +104,7 @@ sieve_dict_storage_get_dict(struct sieve_dict_storage *dstorage,
sieve_storage_set_critical(storage,
"Failed to initialize dict with data '%s' for user '%s': %s",
dstorage->uri, dstorage->username, error);
- *error_r = SIEVE_ERROR_TEMP_FAILURE;
+ *error_code_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
}
}
diff --git a/src/lib-sieve/storage/dict/sieve-dict-storage.h b/src/lib-sieve/storage/dict/sieve-dict-storage.h
index b54ab9cd6276cdfb11be86ca217f49e7128b11a0..b00e007538d566a982e471ed6632f944d0ce0feb 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-storage.h
+++ b/src/lib-sieve/storage/dict/sieve-dict-storage.h
@@ -26,7 +26,7 @@ struct sieve_dict_storage {
int sieve_dict_storage_get_dict(struct sieve_dict_storage *dstorage,
struct dict **dict_r,
- enum sieve_error *error_r);
+ enum sieve_error *error_code_r);
struct sieve_script *
sieve_dict_storage_active_script_open(struct sieve_storage *storage);
@@ -58,11 +58,11 @@ sieve_dict_script_init(struct sieve_dict_storage *dstorage, const char *name);
struct sieve_script_sequence *
sieve_dict_storage_get_script_sequence(struct sieve_storage *storage,
- enum sieve_error *error_r);
+ enum sieve_error *error_code_r);
struct sieve_script *
sieve_dict_script_sequence_next(struct sieve_script_sequence *seq,
- enum sieve_error *error_r);
+ enum sieve_error *error_code_r);
void sieve_dict_script_sequence_destroy(struct sieve_script_sequence *seq);
#endif