diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c index c15858d78456d49136103f8eeae919938f102f0c..5c5b210d80ae38670714343e97c376f0e076efbc 100644 --- a/src/lib-sieve/storage/file/sieve-file-script.c +++ b/src/lib-sieve/storage/file/sieve-file-script.c @@ -307,7 +307,7 @@ sieve_file_script_open(struct sieve_script *script, container_of(storage, struct sieve_file_storage, storage); pool_t pool = script->pool; const char *filename, *name, *path; - const char *dirpath, *basename, *bin_path, *binprefix; + const char *dirpath, *basename, *bin_path, *bin_prefix; struct stat st, lnk_st; bool success = TRUE; int ret = 0; @@ -406,13 +406,13 @@ sieve_file_script_open(struct sieve_script *script, if (*bpath == '\0') { bin_path = bfile; - binprefix = bprefix; + bin_prefix = bprefix; } else if (bpath[strlen(bpath)-1] == '/') { bin_path = t_strconcat(bpath, bfile, NULL); - binprefix = t_strconcat(bpath, bprefix, NULL); + bin_prefix = t_strconcat(bpath, bprefix, NULL); } else { bin_path = t_strconcat(bpath, "/", bfile, NULL); - binprefix = t_strconcat(bpath, "/", bprefix, NULL); + bin_prefix = t_strconcat(bpath, "/", bprefix, NULL); } fscript->st = st; @@ -421,7 +421,7 @@ sieve_file_script_open(struct sieve_script *script, fscript->filename = p_strdup(pool, filename); fscript->dirpath = p_strdup(pool, dirpath); fscript->bin_path = p_strdup(pool, bin_path); - fscript->binprefix = p_strdup(pool, binprefix); + fscript->bin_prefix = p_strdup(pool, bin_prefix); fscript->script.location = fscript->path; @@ -570,7 +570,7 @@ sieve_file_script_binary_get_prefix(struct sieve_script *script) struct sieve_file_script *fscript = container_of(script, struct sieve_file_script, script); - return fscript->binprefix; + return fscript->bin_prefix; } /* diff --git a/src/lib-sieve/storage/file/sieve-file-storage.h b/src/lib-sieve/storage/file/sieve-file-storage.h index 90a3284a46580d8de43b43860567a3f3f49bf48b..08d1969b89e3a2e36a144c3431973417e42be172 100644 --- a/src/lib-sieve/storage/file/sieve-file-storage.h +++ b/src/lib-sieve/storage/file/sieve-file-storage.h @@ -131,7 +131,7 @@ struct sieve_file_script { const char *dirpath; const char *filename; const char *bin_path; - const char *binprefix; + const char *bin_prefix; time_t prev_mtime; };