[dovecot-cvs] dovecot/src/lib-storage/index/dbox
dbox-sync-expunge.c, 1.2, 1.3 dbox-uidlist.c, 1.1, 1.2
cras at dovecot.org
cras at dovecot.org
Wed Dec 21 19:20:10 EET 2005
Update of /var/lib/cvs/dovecot/src/lib-storage/index/dbox
In directory talvi:/tmp/cvs-serv28954
Modified Files:
dbox-sync-expunge.c dbox-uidlist.c
Log Message:
Use DBOX_MAIL_FILE_PREFIX macro
Index: dbox-sync-expunge.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-sync-expunge.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dbox-sync-expunge.c 21 Dec 2005 14:15:37 -0000 1.2
+++ dbox-sync-expunge.c 21 Dec 2005 17:20:08 -0000 1.3
@@ -108,7 +108,8 @@
file_seq = dbox_uidlist_get_new_file_seq(mbox->uidlist);
- path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/msg.%u",
+ path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/"
+ DBOX_MAIL_FILE_PREFIX"%u",
mbox->path, file_seq);
fd = file_dotlock_open(&new_file_dotlock_set, path, 0, &dotlock);
output = o_stream_create_file(fd, default_pool, 0, FALSE);
@@ -333,7 +334,8 @@
if (ctx->dotlock_failed_file_seq != entry->file_seq) {
/* we need to have the file locked in case another process is
appending there already. */
- path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/msg.%u",
+ path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/"
+ DBOX_MAIL_FILE_PREFIX"%u",
ctx->mbox->path, entry->file_seq);
ret = file_dotlock_create(&new_file_dotlock_set, path,
DOTLOCK_CREATE_FLAG_NONBLOCK,
Index: dbox-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-uidlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dbox-uidlist.c 27 Nov 2005 23:05:29 -0000 1.1
+++ dbox-uidlist.c 21 Dec 2005 17:20:08 -0000 1.2
@@ -879,8 +879,8 @@
/* try locking the file. */
str_truncate(str, 0);
- str_printfa(str, "%s/"DBOX_MAILDIR_NAME"/msg.%u",
- mbox->path, file_seq);
+ str_printfa(str, "%s/"DBOX_MAILDIR_NAME"/"
+ DBOX_MAIL_FILE_PREFIX"%u", mbox->path, file_seq);
ret = file_dotlock_create(&dbox_file_dotlock_set, str_c(str),
DOTLOCK_CREATE_FLAG_NONBLOCK,
&dotlock);
@@ -1092,7 +1092,8 @@
entry = dbox_uidlist_entry_lookup_int(ctx->uidlist, file_seq, &idx);
i_assert(entry != NULL);
- path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/msg.%u",
+ path = t_strdup_printf("%s/"DBOX_MAILDIR_NAME"/"
+ DBOX_MAIL_FILE_PREFIX"%u",
ctx->uidlist->mbox->path, entry->file_seq);
if (unlink(path) < 0) {
mail_storage_set_critical(STORAGE(ctx->uidlist->mbox->storage),
More information about the dovecot-cvs
mailing list