From 1cd0b65c4b8959aa4af31ae6c67424ab06b65123 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 15 Sep 2024 00:01:19 +0200
Subject: [PATCH] lib-sieve: storage: file: Rename binprefix to bin_prefix
---
src/lib-sieve/storage/file/sieve-file-script.c | 12 ++++++------
src/lib-sieve/storage/file/sieve-file-storage.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c
index c15858d78..5c5b210d8 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 90a3284a4..08d1969b8 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;
};
--
GitLab