X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compress.c;h=a483b9e535eb859864fba1d3cb9b24b37d066dd7;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hp=b7439f624d5ce356dc10dec79a0234c00b02e1db;hpb=25bf57d598476b329536fa3f748cc0c529fef6bd;p=apps%2Fmadmutt.git

diff --git a/compress.c b/compress.c
index b7439f6..a483b9e 100644
--- a/compress.c
+++ b/compress.c
@@ -18,6 +18,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <errno.h>
 #include <string.h>
@@ -129,7 +130,7 @@ static void set_path (CONTEXT * ctx)
 
   /* Uncompress to /tmp */
   mutt_mktemp (tmppath);
-  ctx->path = safe_malloc (safe_strlen (tmppath) + 1);
+  ctx->path = safe_malloc (str_len (tmppath) + 1);
   strcpy (ctx->path, tmppath);
 }
 
@@ -188,7 +189,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 safe_strdup (expanded);
+  return str_dup (expanded);
 }
 
 int mutt_check_mailbox_compressed (CONTEXT * ctx)
@@ -230,7 +231,7 @@ int mutt_open_read_compressed (CONTEXT * ctx)
   cmd = get_compression_cmd (ci->open, ctx);
   if (cmd == NULL)
     return (-1);
-  dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd));
+  debug_print (2, ("DecompressCmd: '%s'\n", cmd));
 
   if ((fp = fopen (ctx->realpath, "r")) == NULL) {
     mutt_perror (ctx->realpath);
@@ -318,8 +319,7 @@ int mutt_open_append_compressed (CONTEXT * ctx)
 /* close a compressed mailbox */
 void mutt_fast_close_compressed (CONTEXT * ctx)
 {
-  dprint (2, (debugfile, "mutt_fast_close_compressed called on '%s'\n",
-              ctx->path));
+  debug_print (2, ("called on '%s'\n", ctx->path));
 
   if (ctx->compressinfo) {
     if (ctx->fp)
@@ -368,7 +368,7 @@ int mutt_sync_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  dprint (2, (debugfile, "CompressCommand: '%s'\n", cmd));
+  debug_print (2, ("CompressCommand: '%s'\n", cmd));
 
   endwin ();
   fflush (stdout);
@@ -400,8 +400,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
   char *cmd;
   COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo;
 
-  dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n",
-              ctx->path));
+  debug_print (2, ("called on '%s'\n", ctx->path));
 
   if (!(ctx->append && ((append = get_append_command (ctx->realpath, ctx))
                         || (append = ci->close)))) {    /* if we can not or should not append,
@@ -442,7 +441,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  dprint (2, (debugfile, "CompressCmd: '%s'\n", cmd));
+  debug_print (2, ("CompressCmd: '%s'\n", cmd));
 
   endwin ();
   fflush (stdout);