dovecot-2.2-pigeonhole: Sieve file storage: Fixed couple of Cove...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/35e2fcff8e7a
changeset: 2109:35e2fcff8e7a
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Thu Oct 01 00:04:37 2015 +0200
description:
Sieve file storage: Fixed couple of Coverity warnings.

diffstat:

 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(-)

diffs (30 lines):

diff -r 51e2872510a8 -r 35e2fcff8e7a src/lib-sieve/storage/file/sieve-file-script.c
--- a/src/lib-sieve/storage/file/sieve-file-script.c	Thu Oct 01 00:02:44 2015 +0200
+++ b/src/lib-sieve/storage/file/sieve-file-script.c	Thu Oct 01 00:04:37 2015 +0200
@@ -354,13 +354,7 @@
 			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 -r 51e2872510a8 -r 35e2fcff8e7a src/lib-sieve/storage/file/sieve-file-storage.c
--- a/src/lib-sieve/storage/file/sieve-file-storage.c	Thu Oct 01 00:02:44 2015 +0200
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c	Thu Oct 01 00:04:37 2015 +0200
@@ -298,6 +298,8 @@
 	bool have_link = FALSE;
 	int ret;
 
+	i_assert( storage_path != NULL || active_path != NULL );
+
 	fstorage->prev_mtime = (time_t)-1;
 
 	/* Get active script path */