From d3afa6e252257512f25d9ad1c4e19b8559cc8c8a Mon Sep 17 00:00:00 2001
From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Mon, 21 Mar 2022 10:11:08 +0000
Subject: [PATCH] global: Remove stray whitespaces
---
src/lib-sieve/plugins/mime/tag-mime.c | 8 ++++----
src/lib-sieve/sieve-storage.c | 2 +-
.../storage/file/sieve-file-storage-save.c | 6 +++---
.../storage/file/sieve-file-storage.c | 18 +++++++++---------
src/lib-sieve/storage/ldap/sieve-ldap-db.c | 12 ++++++------
.../storage/ldap/sieve-ldap-storage.c | 4 ++--
src/plugins/doveadm-sieve/doveadm-sieve-sync.c | 6 +++---
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/lib-sieve/plugins/mime/tag-mime.c b/src/lib-sieve/plugins/mime/tag-mime.c
index 379365e03..8897a3ad3 100644
--- a/src/lib-sieve/plugins/mime/tag-mime.c
+++ b/src/lib-sieve/plugins/mime/tag-mime.c
@@ -346,7 +346,7 @@ content_type_param_decode(const char *value)
static string_t *
content_type_param_next(struct content_header_stringlist *strlist)
-{
+{
const struct sieve_runtime_env *renv = strlist->strlist.runenv;
const char *const *values = strlist->param_values;
bool trace = strlist->strlist.trace;
@@ -442,7 +442,7 @@ content_header_parse(struct content_header_stringlist *strlist,
/* Parse content type/disposition */
content = t_str_new(64);
- if ( is_ctype ){
+ if ( is_ctype ){
if (rfc822_parse_content_type(&parser, content) < 0) {
str_truncate(content, 0);
return content;
@@ -489,7 +489,7 @@ content_header_parse(struct content_header_stringlist *strlist,
i_assert( is_ctype );
str_truncate(content, (p - type));
}
- break;
+ break;
case EXT_MIME_OPTION_SUBTYPE:
if ( p == NULL ) {
i_assert( !is_ctype );
@@ -507,7 +507,7 @@ content_header_parse(struct content_header_stringlist *strlist,
"extracted MIME sub-type");
}
str_delete(content, 0, (p - type) + 1);
- break;
+ break;
case EXT_MIME_OPTION_CONTENTTYPE:
sieve_runtime_trace(renv, 0,
"extracted full MIME contenttype");
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 1e2aa345f..e52b595c7 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -333,7 +333,7 @@ sieve_storage_init(struct sieve_instance *svinst,
return NULL;
}
- T_BEGIN {
+ T_BEGIN {
storage = sieve_storage_alloc(svinst, event, storage_class,
data, flags, main);
diff --git a/src/lib-sieve/storage/file/sieve-file-storage-save.c b/src/lib-sieve/storage/file/sieve-file-storage-save.c
index bfbe38056..dd2306696 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage-save.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage-save.c
@@ -336,7 +336,7 @@ struct sieve_script *sieve_file_storage_save_get_tempscript
{
struct sieve_file_save_context *fsctx =
(struct sieve_file_save_context *)sctx;
- struct sieve_file_storage *fstorage =
+ struct sieve_file_storage *fstorage =
(struct sieve_file_storage *)sctx->storage;
struct sieve_file_script *tmpscript;
enum sieve_error error;
@@ -376,7 +376,7 @@ static void sieve_file_storage_update_mtime
struct utimbuf times = { .actime = mtime, .modtime = mtime };
if ( utime(path, ×) < 0 ) {
- switch ( errno ) {
+ switch ( errno ) {
case ENOENT:
break;
case EACCES:
@@ -411,7 +411,7 @@ int sieve_file_storage_save_commit
if ( sctx->mtime != (time_t)-1 )
sieve_file_storage_update_mtime(storage, dest_path, sctx->mtime);
} T_END;
-
+
return ( failed ? -1 : 0 );
}
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 76b3ebf35..2e23ee253 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -342,12 +342,12 @@ static int sieve_file_storage_init_common
"(path=%s): %s", active_dir, error);
*error_r = SIEVE_ERROR_TEMP_FAILURE;
return -1;
- }
+ }
e_debug(storage->event,
"Failed to normalize active script directory "
"(path=%s): "
"Part of the path does not exist (yet)",
- active_dir);
+ active_dir);
} else {
active_path = t_abspath_to(active_fname, active_dir);
}
@@ -564,7 +564,7 @@ static int sieve_file_storage_init
}
active_path = storage_path;
storage_path = NULL;
- }
+ }
}
}
@@ -621,7 +621,7 @@ static int sieve_file_storage_do_init_legacy
bool explicit = FALSE, exists = FALSE;
if ( storage_path == NULL || *storage_path == '\0' ) {
- /* Try autodectection */
+ /* Try autodectection */
sieve_file_storage_autodetect(fstorage, &storage_path);
if ( storage_path != NULL && *storage_path != '\0') {
@@ -647,7 +647,7 @@ static int sieve_file_storage_do_init_legacy
return -1;
}
- } else {
+ } else {
/* Get full storage path */
if ( sieve_file_storage_get_full_path
(fstorage, &storage_path, error_r) < 0 )
@@ -662,7 +662,7 @@ static int sieve_file_storage_do_init_legacy
} else {
exists = TRUE;
}
-
+
/* Storage path must be a directory */
if ( exists && !S_ISDIR(fstorage->st.st_mode) ) {
sieve_storage_set_critical(storage,
@@ -692,7 +692,7 @@ static int sieve_file_storage_do_init_legacy
active_path != NULL && *active_path != '\0' &&
(storage->flags & SIEVE_STORAGE_FLAG_READWRITE) == 0 )
storage_path = NULL;
-
+
if ( sieve_file_storage_init_common
(fstorage, active_path, storage_path, exists, error_r) < 0 )
return -1;
@@ -734,7 +734,7 @@ struct sieve_file_storage *sieve_file_storage_init_from_path
storage = sieve_storage_alloc(svinst, NULL, &sieve_file_storage,
"", flags, FALSE);
fstorage = (struct sieve_file_storage *)storage;
-
+
T_BEGIN {
if ( sieve_file_storage_init_common
(fstorage, path, NULL, FALSE, error_r) < 0 ) {
@@ -803,7 +803,7 @@ static int sieve_file_storage_get_last_change
fstorage->prev_mtime = st.st_mtime;
}
-
+
if ( last_change_r != NULL )
*last_change_r = fstorage->prev_mtime;
return 0;
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.c b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
index 0a7b44096..8da710f2e 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
@@ -70,7 +70,7 @@ int ldap_deref_from_str(const char *str, int *deref_r)
*deref_r = LDAP_DEREF_FINDING;
else if (strcasecmp(str, "always") == 0)
*deref_r = LDAP_DEREF_ALWAYS;
- else
+ else
return -1;
return 0;
}
@@ -609,7 +609,7 @@ sasl_interact(LDAP *ld ATTR_UNUSED, unsigned flags ATTR_UNUSED,
in->len = strlen(str);
in->result = str;
}
-
+
}
return LDAP_SUCCESS;
}
@@ -1105,10 +1105,10 @@ sieve_ldap_db_get_script_modattr(struct ldap_connection *conn,
e_warning(storage->event, "db: "
"Search returned more than one Sieve modified attribute `%s'; "
"using only the first one.", set->sieve_ldap_mod_attr);
- }
+ }
*modattr_r = p_strdup(pool, vals[0]);
-
+
ldap_value_free(vals);
ldap_memfree(attr);
return 1;
@@ -1144,7 +1144,7 @@ sieve_ldap_db_get_script(struct ldap_connection *conn,
e_warning(storage->event, "db: "
"Search returned more than one Sieve script attribute `%s'; "
"using only the first one.", set->sieve_ldap_script_attr);
- }
+ }
size = vals[0]->bv_len;
data = i_malloc(size);
@@ -1153,7 +1153,7 @@ sieve_ldap_db_get_script(struct ldap_connection *conn,
"Found script with length %zu", size);
memcpy(data, vals[0]->bv_val, size);
-
+
ldap_value_free_len(vals);
ldap_memfree(attr);
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
index 1f7922a89..5f894e06d 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
@@ -197,7 +197,7 @@ void sieve_storage_ldap_plugin_load
(struct sieve_instance *svinst, void **context ATTR_UNUSED)
{
sieve_storage_class_register
- (svinst, &sieve_ldap_storage_plugin);
+ (svinst, &sieve_ldap_storage_plugin);
e_debug(svinst->event,
"Sieve LDAP storage plugin for %s version %s loaded",
@@ -209,7 +209,7 @@ void sieve_storage_ldap_plugin_unload
void *context ATTR_UNUSED)
{
sieve_storage_class_unregister
- (svinst, &sieve_ldap_storage_plugin);
+ (svinst, &sieve_ldap_storage_plugin);
}
void sieve_storage_ldap_plugin_init(void)
diff --git a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
index c85a3fc63..236638239 100644
--- a/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
+++ b/src/plugins/doveadm-sieve/doveadm-sieve-sync.c
@@ -110,7 +110,7 @@ static int sieve_attribute_unset_script(struct mail_storage *storage,
int ret = 0;
script = sieve_storage_open_script(svstorage, scriptname, NULL);
- if (script == NULL) {
+ if (script == NULL) {
ret = -1;
} else {
ret = sieve_script_delete(script, TRUE);
@@ -416,7 +416,7 @@ sieve_attribute_retrieve_script(struct mail_storage *storage,
*errorstr_r = sieve_storage_get_last_error(svstorage, &error);
else if (sieve_script_get_stream(script, &input, &error) < 0)
sieve_script_unref(&script);
-
+
if (script == NULL) {
if (error == SIEVE_ERROR_NOT_FOUND) {
/* already deleted, but return the last_change */
@@ -552,7 +552,7 @@ sieve_attribute_get(struct mailbox *box,
struct tm *tm = localtime(&value_r->last_change);
char str[256];
const char *timestamp = "";
-
+
if (strftime(str, sizeof(str),
" (last change: %Y-%m-%d %H:%M:%S)", tm) > 0)
timestamp = str;
--
GitLab