dovecot-1.1: Error message fixes

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/da3b83d7928f
changeset: 7403:da3b83d7928f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 11 05:30:14 2008 +0200
description:
Error message fixes

diffstat:

2 files changed, 4 insertions(+), 11 deletions(-)
src/lib-storage/index/cydir/cydir-storage.c |    9 ++-------
src/lib-storage/index/dbox/dbox-storage.c   |    6 ++----

diffs (56 lines):

diff -r ce11885b99a0 -r da3b83d7928f src/lib-storage/index/cydir/cydir-storage.c
--- a/src/lib-storage/index/cydir/cydir-storage.c	Tue Mar 11 04:25:36 2008 +0200
+++ b/src/lib-storage/index/cydir/cydir-storage.c	Tue Mar 11 05:30:14 2008 +0200
@@ -2,17 +2,13 @@
 
 #include "lib.h"
 #include "array.h"
-#include "ioloop.h"
 #include "str.h"
 #include "mkdir-parents.h"
-#include "unlink-directory.h"
 #include "index-mail.h"
 #include "mail-copy.h"
 #include "cydir-sync.h"
 #include "cydir-storage.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
@@ -272,9 +268,8 @@ cydir_delete_nonrecursive(struct mailbox
 		if (unlink(str_c(full_path)) == 0)
 			unlinked_something = TRUE;
 		else if (errno != ENOENT && errno != EISDIR && errno != EPERM) {
-			mailbox_list_set_critical(list,
-				"unlink_directory(%s) failed: %m",
-				str_c(full_path));
+			mailbox_list_set_critical(list, "unlink(%s) failed: %m",
+						  str_c(full_path));
 		}
 	}
 
diff -r ce11885b99a0 -r da3b83d7928f src/lib-storage/index/dbox/dbox-storage.c
--- a/src/lib-storage/index/dbox/dbox-storage.c	Tue Mar 11 04:25:36 2008 +0200
+++ b/src/lib-storage/index/dbox/dbox-storage.c	Tue Mar 11 05:30:14 2008 +0200
@@ -5,7 +5,6 @@
 #include "ioloop.h"
 #include "str.h"
 #include "mkdir-parents.h"
-#include "unlink-directory.h"
 #include "unlink-old-files.h"
 #include "index-mail.h"
 #include "mail-copy.h"
@@ -392,9 +391,8 @@ dbox_delete_nonrecursive(struct mailbox_
 		if (unlink(str_c(full_path)) == 0)
 			unlinked_something = TRUE;
 		else if (errno != ENOENT && errno != EISDIR && errno != EPERM) {
-			mailbox_list_set_critical(list,
-				"unlink_directory(%s) failed: %m",
-				str_c(full_path));
+			mailbox_list_set_critical(list, "unlink(%s) failed: %m",
+						  str_c(full_path));
 		}
 	}