Fix compilation warnings un buffy.c and command.c

[apps/madmutt.git] / compress.c

diff --git a/compress.c b/compress.c
index b9e50ed..72ad440 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -7,24 +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 "mutt.h"
+#include <lib-sys/mutt_signal.h>
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
 
-#ifdef USE_COMPRESSED
+#include "mutt.h"
 
 #include "mx.h"
 #include "mbox.h"
-#include "mutt_curses.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 */
@@ -131,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)
@@ -150,13 +151,13 @@ static void store_size (CONTEXT * ctx)
   ci->size = get_size (ctx->realpath);
 }
 
-static const char *compresshook_format_str (char *dest, size_t destlen,
+static const char *compresshook_format_str (char *dest, ssize_t destlen,
                                             char op, const char *src,
                                             const char *fmt,
-                                            const char *ifstring,
-                                            const char *elsestring,
+                                            const char *ifstring __attribute__ ((unused)),
+                                            const char *elsestring __attribute__ ((unused)),
                                             unsigned long data,
-                                            format_flag flags)
+                                            format_flag flags __attribute__ ((unused)))
 {
   char tmp[SHORT_STRING];
 
@@ -189,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)
@@ -231,7 +232,6 @@ int mutt_open_read_compressed (CONTEXT * ctx)
   cmd = get_compression_cmd (ci->open, ctx);
   if (cmd == NULL)
     return (-1);
-  debug_print (2, ("DecompressCmd: '%s'\n", cmd));
 
   if ((fp = fopen (ctx->realpath, "r")) == NULL) {
     mutt_perror (ctx->realpath);
@@ -319,8 +319,6 @@ int mutt_open_append_compressed (CONTEXT * ctx)
 /* close a compressed mailbox */
 void mutt_fast_close_compressed (CONTEXT * ctx)
 {
-  debug_print (2, ("called on '%s'\n", ctx->path));
-
   if (ctx->compressinfo) {
     if (ctx->fp)
       fclose (ctx->fp);
@@ -368,8 +366,6 @@ int mutt_sync_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  debug_print (2, ("CompressCommand: '%s'\n", cmd));
-
   endwin ();
   fflush (stdout);
   sprintf (echo_cmd, _("echo Compressing %s..."), ctx->realpath);
@@ -400,8 +396,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
   char *cmd;
   COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo;
 
-  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,
                                                          * we only have to remove the compressed info, because sync was already
@@ -441,8 +435,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  debug_print (2, ("CompressCmd: '%s'\n", cmd));
-
   endwin ();
   fflush (stdout);
 
@@ -486,5 +478,3 @@ mx_t* compress_reg_mx (void) {
   fmt->mx_open_mailbox = mutt_open_read_compressed;
   return (fmt);
 }
-
-#endif /* USE_COMPRESSED */