X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fmx_pop.c;h=b75ba148bf99886b73ca8f94c97ce3a45d65df66;hp=822471e6209f4b4157ddfa4af483102db3332652;hb=5b365d691700e8e59f96dfa3a4c209574da29898;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/pop/mx_pop.c b/pop/mx_pop.c
index 822471e..b75ba14 100644
--- a/pop/mx_pop.c
+++ b/pop/mx_pop.c
@@ -3,31 +3,20 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
-#include <sys/stat.h>
-
-#include <lib-lib/mem.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "pop.h"
-
 #include "mx.h"
 #include "mx_pop.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-
-#include "url.h"
-
-static int pop_is_magic (const char* path, struct stat* st) {
+static int pop_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s = url_check_scheme (NONULL (path));
   return ((s == U_POP || s == U_POPS) ? M_POP : -1);
 }
 
-static int acl_check_pop (CONTEXT* ctx, int bit) {
+static int acl_check_pop (CONTEXT* ctx __attribute__ ((unused)), int bit) {
   switch (bit) {
     case ACL_INSERT:    /* editing messages */
     case ACL_WRITE:     /* change importance */
@@ -40,16 +29,17 @@ static int acl_check_pop (CONTEXT* ctx, int bit) {
   }
 }
 
-mx_t* pop_reg_mx (void) {
-  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
-
-  /* make up mx_t record... */
-  fmt->type = M_POP;
-  fmt->mx_is_magic = pop_is_magic;
-  fmt->mx_open_mailbox = pop_open_mailbox;
-  fmt->mx_acl_check = acl_check_pop;
-  fmt->mx_fastclose_mailbox = pop_close_mailbox;
-  fmt->mx_sync_mailbox = pop_sync_mailbox;
-  fmt->mx_check_mailbox = pop_check_mailbox;
-  return (fmt);
-}
+mx_t const pop_mx = {
+    M_POP,
+    0,
+    pop_is_magic,
+    NULL,
+    NULL,
+    pop_open_mailbox,
+    NULL,
+    acl_check_pop,
+    pop_check_mailbox,
+    pop_close_mailbox,
+    pop_sync_mailbox,
+    NULL,
+};