From 31b96ae349d40ade75a5a6b701c1c722dce106b8 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 1 Oct 2015 00:04:37 +0200
Subject: [PATCH] Sieve file storage: Fixed couple of Coverity warnings.
---
src/lib-sieve/storage/file/sieve-file-script.c | 8 +-------
src/lib-sieve/storage/file/sieve-file-storage.c | 2 ++
2 files changed, 3 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 23d499a5c..d6cfe69c9 100644
--- a/src/lib-sieve/storage/file/sieve-file-script.c
+++ b/src/lib-sieve/storage/file/sieve-file-script.c
@@ -354,13 +354,7 @@ static int sieve_file_script_open
if ( ret < 0 ) {
/* Make sure we have a script name for the error */
if ( name == NULL ) {
- if ( basename == NULL ) {
- if ( filename == NULL )
- filename = path_split_filename(path, &dirpath);
- basename = sieve_script_file_get_scriptname(filename);
- if ( basename == NULL )
- basename = filename;
- }
+ i_assert( basename != NULL );
name = basename;
}
sieve_file_script_handle_error
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 81b2cb892..15a2183df 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -298,6 +298,8 @@ static int sieve_file_storage_init_common
bool have_link = FALSE;
int ret;
+ i_assert( storage_path != NULL || active_path != NULL );
+
fstorage->prev_mtime = (time_t)-1;
/* Get active script path */
--
GitLab