From: Timo Sirainen <tss@iki.fi>
Date: Wed, 30 Sep 2015 15:49:39 +0000 (+0300)
Subject: lib-storage: Renamed MAIL_FETCH_UIDL_FILE_NAME to MAIL_FETCH_STORAGE_ID.
X-Git-Tag: 2.2.19~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eb85ec9546bac4eea7d78de8997920ba3debd30;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Renamed MAIL_FETCH_UIDL_FILE_NAME to MAIL_FETCH_STORAGE_ID.
Keep MAIL_FETCH_UIDL_FILE_NAME for backwards compatibility for now.
---

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index 6076b3ec2b..3e20ccfbf4 100644
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1397,7 +1397,7 @@ int index_mail_get_special(struct mail *_mail,
 		return 0;
 	case MAIL_FETCH_BODY_SNIPPET:
 		return index_mail_fetch_body_snippet(mail, value_r);
-	case MAIL_FETCH_UIDL_FILE_NAME:
+	case MAIL_FETCH_STORAGE_ID:
 	case MAIL_FETCH_UIDL_BACKEND:
 	case MAIL_FETCH_SEARCH_RELEVANCY:
 	case MAIL_FETCH_GUID:
diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index af251db669..e7bf9f6694 100644
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -91,7 +91,7 @@ maildir_copy_hardlink(struct mail_save_context *ctx, struct mail *mail)
 			return -1;
 	} else {
 		/* raw / lda */
-		if (mail_get_special(mail, MAIL_FETCH_UIDL_FILE_NAME,
+		if (mail_get_special(mail, MAIL_FETCH_STORAGE_ID,
 				     &path) < 0 || *path == '\0')
 			return 0;
 		if (do_hardlink(dest_mbox, path, &do_ctx) < 0)
diff --git a/src/lib-storage/index/maildir/maildir-mail.c b/src/lib-storage/index/maildir/maildir-mail.c
index d4cf0046f5..5d60b11a08 100644
--- a/src/lib-storage/index/maildir/maildir-mail.c
+++ b/src/lib-storage/index/maildir/maildir-mail.c
@@ -232,7 +232,7 @@ static int maildir_get_pop3_state(struct index_mail *mail)
 	/* if this mail itself has non-pop3 fields we know we're not
 	   pop3-only */
 	allowed_pop3_fields = MAIL_FETCH_FLAGS | MAIL_FETCH_STREAM_HEADER |
-		MAIL_FETCH_STREAM_BODY | MAIL_FETCH_UIDL_FILE_NAME |
+		MAIL_FETCH_STREAM_BODY | MAIL_FETCH_STORAGE_ID |
 		MAIL_FETCH_VIRTUAL_SIZE;
 
 	if (mail->data.wanted_headers != NULL ||
@@ -524,12 +524,12 @@ maildir_mail_get_special(struct mail *_mail, enum mail_fetch_field field,
 		}
 
 		/* default to base filename: */
-		if (maildir_mail_get_special(_mail, MAIL_FETCH_UIDL_FILE_NAME,
+		if (maildir_mail_get_special(_mail, MAIL_FETCH_STORAGE_ID,
 					     value_r) < 0)
 			return -1;
 		mail->data.guid = mail->data.filename;
 		return 0;
-	case MAIL_FETCH_UIDL_FILE_NAME:
+	case MAIL_FETCH_STORAGE_ID:
 		if (mail->data.filename != NULL) {
 			*value_r = mail->data.filename;
 			return 0;
@@ -561,7 +561,7 @@ maildir_mail_get_special(struct mail *_mail, enum mail_fetch_field field,
 		} else if (*uidl == '\0') {
 			/* special optimization case: use the base file name */
 			return maildir_mail_get_special(_mail,
-					MAIL_FETCH_UIDL_FILE_NAME, value_r);
+					MAIL_FETCH_STORAGE_ID, value_r);
 		} else {
 			*value_r = p_strdup(mail->mail.data_pool, uidl);
 		}
@@ -621,7 +621,7 @@ static void maildir_update_pop3_uidl(struct mail *_mail, const char *uidl)
 	struct maildir_mailbox *mbox = (struct maildir_mailbox *)_mail->box;
 	const char *fname;
 
-	if (maildir_mail_get_special(_mail, MAIL_FETCH_UIDL_FILE_NAME,
+	if (maildir_mail_get_special(_mail, MAIL_FETCH_STORAGE_ID,
 				     &fname) == 0 &&
 	    strcmp(uidl, fname) == 0) {
 		/* special case optimization: empty UIDL means the same
diff --git a/src/lib-storage/index/raw/raw-mail.c b/src/lib-storage/index/raw/raw-mail.c
index 8c8790b8cf..71b50207e4 100644
--- a/src/lib-storage/index/raw/raw-mail.c
+++ b/src/lib-storage/index/raw/raw-mail.c
@@ -105,7 +105,7 @@ raw_mail_get_special(struct mail *_mail, enum mail_fetch_field field,
 		*value_r = mbox->envelope_sender != NULL ?
 			mbox->envelope_sender : "";
 		return 0;
-	case MAIL_FETCH_UIDL_FILE_NAME:
+	case MAIL_FETCH_STORAGE_ID:
 		*value_r = mbox->have_filename ?
 			mailbox_get_path(_mail->box) : "";
 		return 0;
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 84d95f5549..748deb030a 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -150,7 +150,8 @@ enum mail_fetch_field {
 	MAIL_FETCH_IMAP_ENVELOPE	= 0x00004000,
 	MAIL_FETCH_FROM_ENVELOPE	= 0x00008000,
 	MAIL_FETCH_HEADER_MD5		= 0x00010000,
-	MAIL_FETCH_UIDL_FILE_NAME	= 0x00020000,
+	MAIL_FETCH_STORAGE_ID		= 0x00020000,
+#define MAIL_FETCH_UIDL_FILE_NAME MAIL_FETCH_STORAGE_ID /* FIXME: remove in v2.3 */
 	MAIL_FETCH_UIDL_BACKEND		= 0x00040000,
 	MAIL_FETCH_MAILBOX_NAME		= 0x00080000,
 	MAIL_FETCH_SEARCH_RELEVANCY	= 0x00100000,
diff --git a/src/pop3/pop3-commands.c b/src/pop3/pop3-commands.c
index f7bfb65daf..b1db402111 100644
--- a/src/pop3/pop3-commands.c
+++ b/src/pop3/pop3-commands.c
@@ -620,7 +620,7 @@ pop3_get_uid(struct client *client, struct mail *mail, string_t *str,
 		}
 	}
 	if ((client->uidl_keymask & UIDL_FILE_NAME) != 0) {
-		if (mail_get_special(mail, MAIL_FETCH_UIDL_FILE_NAME,
+		if (mail_get_special(mail, MAIL_FETCH_STORAGE_ID,
 				     &tab[3].value) < 0) {
 			i_error("UIDL: File name lookup failed: %s",
 				mailbox_get_last_error(mail->box, NULL));