X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mh.c;h=bfaaab229979ffa3c7177199883f78aad135eaf7;hp=e03762abc701d5b3fafccc88ba2189805e300684;hb=6be673363a420d4f21e9ab1fbd5835ffba38a7ed;hpb=230399f9632c37b66c1c117a17e8327eae6b3235

diff --git a/mh.c b/mh.c
index e03762a..bfaaab2 100644
--- a/mh.c
+++ b/mh.c
@@ -13,29 +13,9 @@
  * mailboxes.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <limits.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
+#include <lib-lib/lib-lib.h>
 #include <utime.h>
 
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
@@ -1868,15 +1848,6 @@ static int maildir_is_magic (const char* path, struct stat* st) {
   return (-1);
 }
 
-/* routines common to maildir and mh */
-static mx_t* reg_mx (void) {
-  mx_t* fmt = p_new(mx_t, 1);
-  fmt->local = 1;
-  fmt->mx_access = access;
-  fmt->mx_sync_mailbox = mh_sync_mailbox;
-  return (fmt);
-}
-
 static int mh_commit (MESSAGE* msg, CONTEXT* ctx) {
   return (mh_commit_message (msg, ctx, NULL));
 }
@@ -1885,26 +1856,32 @@ static int maildir_commit (MESSAGE* msg, CONTEXT* ctx) {
   return (maildir_commit_message (msg, ctx, NULL));
 }
 
-mx_t* mh_reg_mx (void) {
-  mx_t* fmt = reg_mx ();
-  fmt->type = M_MH;
-  fmt->mx_check_empty = mh_check_empty;
-  fmt->mx_is_magic = mh_is_magic;
-  fmt->mx_open_mailbox = mh_read_dir;
-  fmt->mx_open_new_message = mh_open_new_message;
-  fmt->mx_check_mailbox = mh_check_mailbox;
-  fmt->mx_commit_message = mh_commit;
-  return (fmt);
-}
+mx_t const maildir_mx = {
+    M_MAILDIR,
+    1,
+    maildir_is_magic,
+    maildir_check_empty,
+    access,
+    maildir_read_dir,
+    maildir_open_new_message,
+    NULL,
+    maildir_check_mailbox,
+    NULL,
+    mh_sync_mailbox,
+    maildir_commit
+};
 
-mx_t* maildir_reg_mx (void) {
-  mx_t* fmt = reg_mx ();
-  fmt->type = M_MAILDIR;
-  fmt->mx_check_empty = maildir_check_empty;
-  fmt->mx_is_magic = maildir_is_magic;
-  fmt->mx_open_mailbox = maildir_read_dir;
-  fmt->mx_open_new_message = maildir_open_new_message;
-  fmt->mx_check_mailbox = maildir_check_mailbox;
-  fmt->mx_commit_message = maildir_commit;
-  return (fmt);
-}
+mx_t const mh_mx = {
+    M_MH,
+    1,
+    mh_is_magic,
+    mh_check_empty,
+    access,
+    mh_read_dir,
+    mh_open_new_message,
+    NULL,
+    mh_check_mailbox,
+    NULL,
+    mh_sync_mailbox,
+    mh_commit
+};