global: Rename plugin/zlib -> plugin/mail-compress in comments

diff --git a/doc/example-config/conf.d/10-mail.conf b/doc/example-config/conf.d/10-mail.conf
index 2dea0d662c97518a17e219f5afaab7f883422e59..db79e3710460d17d2d3d8c30cb29818cb06d9295 100644 (file)
--- a/doc/example-config/conf.d/10-mail.conf
+++ b/doc/example-config/conf.d/10-mail.conf
@@ -169,8 +169,8 @@ namespace inbox {
 
 # Directory where mails can be temporarily stored. Usually it's used only for
 # mails larger than >= 128 kB. It's used by various parts of Dovecot, for
-# example LDA/LMTP while delivering large mails or zlib plugin for keeping
-# uncompressed mails.
+# example LDA/LMTP while delivering large mails or mail-compress plugin for
+# keeping uncompressed mails.
 #mail_temp_dir = /tmp
 
 # Valid UID range for users, defaults to 500 and above. This is mostly

diff --git a/src/lib-storage/index/dbox-common/dbox-save.c b/src/lib-storage/index/dbox-common/dbox-save.c
index c5af8cc66de924323028e143b28f6258da03b41f..7ab4b5669a207b3ecaf2b96a769fcd4885097c6e 100644 (file)
--- a/src/lib-storage/index/dbox-common/dbox-save.c
+++ b/src/lib-storage/index/dbox-common/dbox-save.c
@@ -95,7 +95,7 @@ void dbox_save_end(struct dbox_save_context *ctx)
                        ctx->failed = TRUE;
        }
        if (mdata->output != dbox_output) {
-               /* e.g. zlib plugin had changed this. make sure we
+               /* e.g. mail-compress plugin had changed this. make sure we
                   successfully write the trailer. */
                ret = o_stream_finish(mdata->output);
        } else {

diff --git a/src/lib-storage/index/maildir/maildir-save.c b/src/lib-storage/index/maildir/maildir-save.c
index 8df0aefbc708ab3158cba9e5ff0bbefe904e1562..586be5b2dfe8da472529b5d96acc1f210450a28c 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-save.c
+++ b/src/lib-storage/index/maildir/maildir-save.c
@@ -587,8 +587,9 @@ static int maildir_save_finish_real(struct mail_save_context *_ctx)
                   (!maildir_filename_get_size(ctx->file_last->dest_basename,
                                               MAILDIR_EXTRA_FILE_SIZE, &size) ||
                    size != ctx->file_last->size)) {
-               /* e.g. zlib plugin was used. the "physical size" must be in
-                  the maildir filename, since stat() will return wrong size */
+               /* e.g. mail-compress plugin was used. the "physical size" must
+                  be in the maildir filename, since stat() will return wrong
+                  size */
                ctx->file_last->preserve_filename = FALSE;
                /* preserve the GUID if needed */
                if (ctx->file_last->guid == NULL)

diff --git a/src/lib-storage/index/maildir/maildir-sync.c b/src/lib-storage/index/maildir/maildir-sync.c
index 3d82744efe40ba992c30984a651abc341f146df0..69be170c69af6db6fc4eda148e356d9abeaebb61 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-sync.c
+++ b/src/lib-storage/index/maildir/maildir-sync.c
@@ -333,7 +333,7 @@ static int maildir_fix_duplicate(struct maildir_sync_context *ctx,
 
        new_fname = maildir_filename_generate();
        /* preserve S= and W= sizes if they're available.
-          (S=size is required for zlib plugin to work) */
+          (S=size is required for mail-compress plugin to work) */
        if (maildir_filename_get_size(fname2, MAILDIR_EXTRA_FILE_SIZE, &size)) {
                new_fname = t_strdup_printf("%s,%c=%"PRIuUOFF_T,
                        new_fname, MAILDIR_EXTRA_FILE_SIZE, size);

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 79ba6465c3e20a3fad3276a9d84d16d2903bd6b7..f6ade9f13d8072eb6f10f8810155315cba91c235 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -102,7 +102,7 @@ enum mail_storage_class_flags {
           mailbox_status.have_save_guids=TRUE) */
        MAIL_STORAGE_CLASS_FLAG_HAVE_MAIL_SAVE_GUIDS    = 0x80,
        /* message content can be unstructured binary data
-          (e.g. zlib plugin is allowed to compress/decompress mails) */
+          (e.g. mail-compress plugin is allowed to compress/decompress mails) */
        MAIL_STORAGE_CLASS_FLAG_BINARY_DATA     = 0x100,
        /* Message GUIDs can only be 128bit (always set
           mailbox_status.have_only_guid128) */

diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index 21da3481f26f6be2ff4caef45240f40c5533b85a..c4a44507105acdefdf3c586ec2a38288c30cd936 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -1,8 +1,8 @@
 /* Copyright (c) 2015-2018 Dovecot authors, see the included COPYING file */
 
 /* FIXME: cache handling could be useful to move to Dovecot core, so that if
-   we're using this plugin together with zlib plugin there would be just one
-   cache. */
+   we're using this plugin together with compress plugin there would be just
+   one cache. */
 
 #include "lib.h"
 #include "ioloop.h"
@@ -173,7 +173,7 @@ mail_crypt_istream_opened(struct mail *_mail, struct istream **stream)
        }
 
        /* decryption is the outmost stream, so add it before others
-          (e.g. zlib) */
+          (e.g. mail-compress) */
        if (!mail_crypt_is_stream_encrypted(*stream))
                return mmail->super.istream_opened(_mail, stream);
 
@@ -323,7 +323,7 @@ mail_crypt_mail_save_begin(struct mail_save_context *ctx,
                mbox->pub_key = pub_key;
        }
 
-       /* encryption is the outermost layer (zlib etc. are inside) */
+       /* encryption is the outermost layer (mail-compress etc. are inside) */
        struct ostream *output = o_stream_create_encrypt(ctx->data.output,
                        MAIL_CRYPT_ENC_ALGORITHM, pub_key, enc_flags);