X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=456719af9bc67de44cb85dde0adbb7b787a27966;hp=622bbc5aec9265b6d8a11c2077e3b50d570fd89b;hb=dbacadf0ce81052365d7a43373ac7d4ac67ff91e;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/compress.c b/compress.c
index 622bbc5..456719a 100644
--- a/compress.c
+++ b/compress.c
@@ -7,25 +7,25 @@
  * please see the file GPL in the top level source directory.
  */
 
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.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 "mutt.h"
+#include <lib-sys/mutt_signal.h>
 
-#ifdef USE_COMPRESSED
+#include <lib-ui/curses.h>
+
+#include "mutt.h"
 
 #include "mx.h"
 #include "mbox.h"
-#include "mutt_curses.h"
-
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
-#include "lib/debug.h"
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
 typedef struct {
   const char *close;            /* close-hook  command */
@@ -132,7 +132,7 @@ static void set_path (CONTEXT * ctx)
 
   /* Uncompress to /tmp */
   mutt_mktemp (tmppath);
-  ctx->path = p_dupstr(tmppath, str_len(tmppath));
+  ctx->path = p_dupstr(tmppath, m_strlen(tmppath));
 }
 
 static int get_size (const char *path)
@@ -190,7 +190,7 @@ static char *get_compression_cmd (const char *cmd, const CONTEXT * ctx)
 
   mutt_FormatString (expanded, sizeof (expanded), cmd,
                      compresshook_format_str, (unsigned long) ctx, 0);
-  return str_dup (expanded);
+  return m_strdup(expanded);
 }
 
 int mutt_check_mailbox_compressed (CONTEXT * ctx)
@@ -478,7 +478,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
 }
 
 mx_t* compress_reg_mx (void) {
-  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
   fmt->type = M_COMPRESSED;
   fmt->local = 1;
   fmt->mx_is_magic = mbox_is_magic;
@@ -487,5 +487,3 @@ mx_t* compress_reg_mx (void) {
   fmt->mx_open_mailbox = mutt_open_read_compressed;
   return (fmt);
 }
-
-#endif /* USE_COMPRESSED */