rename maildir_flags()

diff --git a/compress.c b/compress.c
index fe6537aa1eb0966ef8b688e16756fd3eae546da1..f8bff32ad63b9a83db805192b2f3a7762b0e0d90 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -52,8 +52,8 @@ struct Header;
 
 /* Notes:
  * Any references to compressed files also apply to encrypted files.
- * maibox->path     == plaintext file
- * maibox->realpath == compressed file
+ * - mailbox->path     == plaintext file
+ * - mailbox->realpath == compressed file
  */
 
 /**

diff --git a/maildir/maildir.h b/maildir/maildir.h
index eae031d96669b64df2da5ea262a604032863102d..50a612badbb2d7732ed21d4f7571ee43d587f836 100644 (file)
--- a/maildir/maildir.h
+++ b/maildir/maildir.h
@@ -56,7 +56,7 @@ extern struct MxOps mx_maildir_ops;
 extern struct MxOps mx_mh_ops;
 
 int            maildir_check_empty(const char *path);
-void           maildir_flags(char *dest, size_t destlen, struct Header *hdr);
+void           maildir_gen_flags(char *dest, size_t destlen, struct Header *hdr);
 FILE *         maildir_open_find_message(const char *folder, const char *msg, char **newname);
 void           maildir_parse_flags(struct Header *h, const char *path);
 struct Header *maildir_parse_message(enum MailboxType magic, const char *fname, bool is_old, struct Header *h);

diff --git a/maildir/mh.c b/maildir/mh.c
index 5bea13b8b706f7857368538be227a90837c596e5..b059d8c9513be29f41ba94ba20a2bb409fdbb847 100644 (file)
--- a/maildir/mh.c
+++ b/maildir/mh.c
@@ -1654,7 +1654,7 @@ static int maildir_sync_message(struct Context *ctx, int msgno)
     if (p)
       *p = '\0';
 
-    maildir_flags(suffix, sizeof(suffix), h);
+    maildir_gen_flags(suffix, sizeof(suffix), h);
 
     snprintf(partpath, sizeof(partpath), "%s/%s%s",
              (h->read || h->old) ? "cur" : "new", newpath, suffix);
@@ -1998,7 +1998,7 @@ struct Header *maildir_parse_message(enum MailboxType magic, const char *fname,
  * @param destlen Length of buffer
  * @param hdr     Header of the email
  */
-void maildir_flags(char *dest, size_t destlen, struct Header *hdr)
+void maildir_gen_flags(char *dest, size_t destlen, struct Header *hdr)
 {
   *dest = '\0';
 
@@ -2526,7 +2526,7 @@ static int maildir_msg_open_new(struct Context *ctx, struct Message *msg, struct
     bool deleted = hdr->deleted;
     hdr->deleted = false;
 
-    maildir_flags(suffix, sizeof(suffix), hdr);
+    maildir_gen_flags(suffix, sizeof(suffix), hdr);
 
     hdr->deleted = deleted;
   }

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index b16e18535ce1bb5c1adfb3bbc6dc6ea8047e0ca0..63caf426dc05d520c38a0071595618a3176df103 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -1544,7 +1544,7 @@ static int rename_maildir_filename(const char *old, char *buf, size_t buflen,
     *p = '\0';
 
   /* compose new flags */
-  maildir_flags(suffix, sizeof(suffix), h);
+  maildir_gen_flags(suffix, sizeof(suffix), h);
 
   snprintf(buf, buflen, "%s/%s/%s%s", folder,
            (h->read || h->old) ? "cur" : "new", filename, suffix);