From ff7d90899707bf7df36a755fd3ca36beed2fffc8 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Tue, 24 Mar 2020 17:59:18 +0200
Subject: [PATCH] global: Remove dead assignments
Found by latest clang scan-build.
---
src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c | 4 ++--
src/lib-sieve/sieve-message.c | 4 +---
src/plugins/sieve-extprograms/sieve-extprograms-common.c | 5 ++---
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c b/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
index d39ec50f4..5d5ee46cb 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
+++ b/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
@@ -490,9 +490,9 @@ act_report_send(const struct sieve_action_exec_env *aenv,
report_from.type = SIEVE_ADDRESS_SOURCE_DEFAULT;
report_from.address = NULL;
}
- if ((ret = sieve_address_source_get_address(
+ if (sieve_address_source_get_address(
&report_from, svinst, senv, msgctx, eenv->flags,
- &sender)) > 0 && sender != NULL)
+ &sender) > 0 && sender != NULL)
from = smtp_address_encode_path(sender);
else
from = sieve_get_postmaster_address(senv);
diff --git a/src/lib-sieve/sieve-message.c b/src/lib-sieve/sieve-message.c
index afbf31f70..f4179bcac 100644
--- a/src/lib-sieve/sieve-message.c
+++ b/src/lib-sieve/sieve-message.c
@@ -1096,7 +1096,6 @@ static int sieve_message_parts_add_missing
unsigned int idx = 0;
bool save_body = FALSE, have_all;
string_t *hdr_content = NULL;
- int ret;
/* First check whether any are missing */
if ( !iter_all && sieve_message_body_get_return_parts
@@ -1134,8 +1133,7 @@ static int sieve_message_parts_add_missing
// hparser_flags, mparser_flags);
parser = message_parser_init(pool_datastack_create(),
input, hparser_flags, mparser_flags);
- while ( (ret=message_parser_parse_next_block
- (parser, &block)) > 0 ) {
+ while ( message_parser_parse_next_block(parser, &block) > 0 ) {
struct sieve_message_part **body_part_idx;
struct message_header_line *hdr = block.hdr;
struct sieve_message_header *header;
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.c b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
index 2da3ab183..65942fd43 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-common.c
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
@@ -418,7 +418,6 @@ struct sieve_extprogram *sieve_extprogram_create
const char *path = NULL;
struct stat st;
bool fork = FALSE;
- int ret;
e_debug(svinst->event, "action %s: "
"running program: %s", action, program_name);
@@ -437,7 +436,7 @@ struct sieve_extprogram *sieve_extprogram_create
if ( ext_config->socket_dir != NULL ) {
path = t_strconcat(senv->user->set->base_dir, "/",
ext_config->socket_dir, "/", program_name, NULL);
- if ( (ret=stat(path, &st)) < 0 ) {
+ if ( stat(path, &st) < 0 ) {
switch ( errno ) {
case ENOENT:
e_debug(svinst->event, "action %s: "
@@ -471,7 +470,7 @@ struct sieve_extprogram *sieve_extprogram_create
if ( path == NULL && ext_config->bin_dir != NULL ) {
fork = TRUE;
path = t_strconcat(ext_config->bin_dir, "/", program_name, NULL);
- if ( (ret=stat(path, &st)) < 0 ) {
+ if ( stat(path, &st) < 0 ) {
switch ( errno ) {
case ENOENT:
e_debug(svinst->event, "action %s: "
--
GitLab