X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fspool_mbox.c;h=cf7909fbe2b628afe0a3be75c9ccd5bb67d60bea;hb=a746f186fdd8b3b6561919177b6dd011c2b177e4;hp=4f3c4d25bb26de9a6db786685927843131cb05d7;hpb=1e1ddfac79fbcd052f199500a6493c7f79cb8462;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/spool_mbox.c b/src/src/spool_mbox.c index 4f3c4d25b..cf7909fbe 100644 --- a/src/src/spool_mbox.c +++ b/src/src/spool_mbox.c @@ -53,8 +53,8 @@ if (!spool_mbox_ok) temp_string = string_sprintf("scan/%s", message_id); if (!directory_make(spool_directory, temp_string, 0750, FALSE)) { - log_write(0, LOG_MAIN|LOG_PANIC, "%s", string_open_failed(errno, - "scan directory %s/scan/%s", spool_directory, temp_string)); + log_write(0, LOG_MAIN|LOG_PANIC, "%s", + string_open_failed("scan directory %s/scan/%s", spool_directory, temp_string)); goto OUT; } @@ -62,8 +62,8 @@ if (!spool_mbox_ok) if (!(mbox_file = modefopen(mbox_path, "wb", SPOOL_MODE))) { - log_write(0, LOG_MAIN|LOG_PANIC, "%s", string_open_failed(errno, - "scan file %s", mbox_path)); + log_write(0, LOG_MAIN|LOG_PANIC, "%s", + string_open_failed("scan file %s", mbox_path)); goto OUT; } @@ -185,8 +185,8 @@ if (!spool_mbox_ok) if ( !(yield = Ufopen(mbox_path,"rb")) || fstat(fileno(yield), &statbuf) != 0 ) - log_write(0, LOG_MAIN|LOG_PANIC, "%s", string_open_failed(errno, - "scan file %s", mbox_path)); + log_write(0, LOG_MAIN|LOG_PANIC, "%s", + string_open_failed( "scan file %s", mbox_path)); else *mbox_file_size = statbuf.st_size; @@ -226,12 +226,11 @@ if (spool_mbox_ok && !f.no_mbox_unspool) for (struct dirent *entry; entry = readdir(tempdir); ) { uschar *name = US entry->d_name; - int dummy; if (Ustrcmp(name, US".") == 0 || Ustrcmp(name, US"..") == 0) continue; file_path = string_sprintf("%s/%s", mbox_path, name); debug_printf("unspool_mbox(): unlinking '%s'\n", file_path); - dummy = unlink(CS file_path); dummy = dummy; /* compiler quietening */ + (void) unlink(CS file_path); } closedir(tempdir);