Changeset 5027:e9451c4c0092

Timestamp:

2007-03-30 19:22:55 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Add function pointer for close hook in Context.
Slowly inch towards function pointers instead of switch statements.

Files:

• imap/imap.c (modified) (1 diff)
• mutt.h (modified) (3 diffs)
• mx.c (modified) (1 diff)
• pop.c (modified) (1 diff)

imap/imap.c

@@ -570 +570 @@
   /* once again the context is new */
   ctx->data = idata;
+  ctx->mx_close = imap_close_mailbox;
 
   /* Clean up path and replace the one in the ctx */

mutt.h

@@ -857 +857 @@
 };
 
-typedef struct
+typedef struct _context
 {
   char *path;
@@ -883 +883 @@
   int flagged;                  /* how many flagged messages */
   int msgnotreadyet;            /* which msg "new" in pager, -1 if none */
-#if defined USE_POP || defined USE_IMAP
-  void *data;                   /* driver specific data */
-#endif /* USE_IMAP */
 
   short magic;                  /* mailbox type */
@@ -899 +896 @@
   unsigned int collapsed : 1;   /* are all threads collapsed? */
   unsigned int closing : 1;     /* mailbox is being closed */
+
+  /* driver hooks */
+  void *data;                   /* driver specific data */
+  int (*mx_close)(struct _context *);
 } CONTEXT;
 

mx.c

@@ -741 +741 @@
   if(!ctx) 
     return;
-  
-#ifdef USE_IMAP
-  if (ctx->magic == M_IMAP)
-    imap_close_mailbox (ctx);
-#endif /* USE_IMAP */
-#ifdef USE_POP
-  if (ctx->magic == M_POP)
-    pop_close_mailbox (ctx);
-#endif /* USE_POP */
+
+  if (ctx->mx_close)
+    ctx->mx_close (ctx);
+
   if (ctx->subj_hash)
     hash_destroy (&ctx->subj_hash, NULL);

pop.c

@@ -373 +373 @@
   pop_data->conn = conn;
   ctx->data = pop_data;
+  ctx->mx_close = pop_close_mailbox;
 
   if (pop_open_connection (pop_data) < 0)