move signal.c into lib/sys

[apps/madmutt.git] / mbox.c

diff --git a/mbox.c b/mbox.c
index c3dc0fd..5f76334 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -13,10 +13,22 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+#include <dirent.h>
+#include <string.h>
+#include <utime.h>
+#include <sys/file.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/mutt_signal.h>
 
 #include "mutt.h"
 #include "mx.h"
@@ -27,17 +39,6 @@
 #include "copy.h"
 #include "compress.h"
 
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <dirent.h>
-#include <string.h>
-#include <utime.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-
 /* struct used by mutt_sync_mailbox() to store new offsets */
 struct m_update_t {
   short valid;
@@ -48,7 +49,7 @@ struct m_update_t {
 };
 
 
-static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mbox_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr __attribute__ ((unused)))
 {
   msg->fp = dest->fp;
   return 0;
@@ -125,7 +126,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
 
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
-      ctx->hdrs[ctx->msgcount] = hdr = mutt_new_header ();
+      ctx->hdrs[ctx->msgcount] = hdr = header_new();
       hdr->offset = loc;
       hdr->index = ctx->msgcount;
 
@@ -262,7 +263,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
 
-      curhdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+      curhdr = ctx->hdrs[ctx->msgcount] = header_new();
       curhdr->received = t - tz;
       curhdr->offset = loc;
       curhdr->index = ctx->msgcount;
@@ -520,7 +521,7 @@ static int mbox_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
  *     0       success
  *     -1      failure
  */
-static int _mbox_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int _mbox_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), int *index_hint)
 {
   char tempfile[_POSIX_PATH_MAX];
   char buf[32];
@@ -906,7 +907,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   p_delete(&ctx->v2r);
   if (ctx->readonly) {
     for (i = 0; i < ctx->msgcount; i++)
-      mutt_free_header (&(ctx->hdrs[i]));       /* nothing to do! */
+      header_delete(&(ctx->hdrs[i]));       /* nothing to do! */
     p_delete(&ctx->hdrs);
   }
   else {
@@ -952,7 +953,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   if (rc == -1) {
     /* free the old headers */
     for (j = 0; j < old_msgcount; j++)
-      mutt_free_header (&(old_hdrs[j]));
+      header_delete(&(old_hdrs[j]));
     p_delete(&old_hdrs);
 
     ctx->quiet = 0;
@@ -1010,14 +1011,14 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
         mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
 
         /* we don't need this header any more */
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
       }
     }
 
     /* free the remaining old headers */
     for (j = 0; j < old_msgcount; j++) {
       if (old_hdrs[j]) {
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
         msg_mod = 1;
       }
     }
@@ -1089,7 +1090,7 @@ int mbox_is_magic (const char* path, struct stat* st) {
   return (magic);
 }
 
-static int commit_message (MESSAGE* msg, CONTEXT* ctx, int mbox) {
+static int commit_message (MESSAGE* msg, CONTEXT* ctx __attribute__ ((unused)), int mbox) {
   if ((mbox && fputc ('\n', msg->fp) == EOF) ||
       (!mbox && fputs (MMDF_SEP, msg->fp) == EOF))
     return (-1);