From 8d302dba110420afd720bbcc2b443f3a1b6205ef Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 14 Sep 2024 23:36:47 +0200
Subject: [PATCH] lib-sieve: sieve-storage - Rename
sieve_storage_setup_bindir() to sieve_storage_setup_bin_path()
---
src/lib-sieve/sieve-script.c | 2 +-
src/lib-sieve/sieve-storage-private.h | 2 +-
src/lib-sieve/sieve-storage.c | 2 +-
src/lib-sieve/storage/dict/sieve-dict-script.c | 2 +-
src/lib-sieve/storage/file/sieve-file-script.c | 2 +-
src/lib-sieve/storage/ldap/sieve-ldap-script.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 3b2ba963c..eacc43661 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -567,7 +567,7 @@ const char *sieve_script_binary_get_prefix(struct sieve_script *script)
struct sieve_storage *storage = script->storage;
if (storage->bin_path != NULL &&
- sieve_storage_setup_bindir(storage, 0700) >= 0)
+ sieve_storage_setup_bin_path(storage, 0700) >= 0)
return t_strconcat(storage->bin_path, "/", script->name, NULL);
if (script->v.binary_get_prefix == NULL)
return NULL;
diff --git a/src/lib-sieve/sieve-storage-private.h b/src/lib-sieve/sieve-storage-private.h
index e7b48f969..3a27df28e 100644
--- a/src/lib-sieve/sieve-storage-private.h
+++ b/src/lib-sieve/sieve-storage-private.h
@@ -129,7 +129,7 @@ int sieve_storage_alloc(struct sieve_instance *svinst, struct event *event,
const char *data, enum sieve_storage_flags flags,
bool main, struct sieve_storage **storage_r);
-int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode);
+int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode);
/*
* Active script
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 35b7fd177..934f86f11 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -614,7 +614,7 @@ void sieve_storage_unref(struct sieve_storage **_storage)
pool_unref(&storage->pool);
}
-int sieve_storage_setup_bindir(struct sieve_storage *storage, mode_t mode)
+int sieve_storage_setup_bin_path(struct sieve_storage *storage, mode_t mode)
{
const char *bin_path = storage->bin_path;
struct stat st;
diff --git a/src/lib-sieve/storage/dict/sieve-dict-script.c b/src/lib-sieve/storage/dict/sieve-dict-script.c
index c7e55eef5..bcafd4a51 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-script.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-script.c
@@ -249,7 +249,7 @@ sieve_dict_script_binary_save(struct sieve_script *script,
if (sieve_dict_script_get_binpath(dscript) == NULL)
return 0;
- if (sieve_storage_setup_bindir(script->storage, 0700) < 0)
+ if (sieve_storage_setup_bin_path(script->storage, 0700) < 0)
return -1;
return sieve_binary_save(sbin, dscript->binpath, update, 0600,
diff --git a/src/lib-sieve/storage/file/sieve-file-script.c b/src/lib-sieve/storage/file/sieve-file-script.c
index 37342e82b..a3ce84df2 100644
--- a/src/lib-sieve/storage/file/sieve-file-script.c
+++ b/src/lib-sieve/storage/file/sieve-file-script.c
@@ -555,7 +555,7 @@ sieve_file_script_binary_save(struct sieve_script *script,
container_of(script, struct sieve_file_script, script);
if (storage->bin_path != NULL &&
- sieve_storage_setup_bindir(storage, 0700) < 0)
+ sieve_storage_setup_bin_path(storage, 0700) < 0)
return -1;
return sieve_binary_save(
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-script.c b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
index 585ce04d6..52e6b6107 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-script.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-script.c
@@ -272,7 +272,7 @@ sieve_ldap_script_binary_save(struct sieve_script *script,
if (sieve_ldap_script_get_binpath(lscript) == NULL)
return 0;
- if (sieve_storage_setup_bindir(script->storage, 0700) < 0)
+ if (sieve_storage_setup_bin_path(script->storage, 0700) < 0)
return -1;
return sieve_binary_save(sbin, lscript->binpath, update, 0600,
--
GitLab