X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=6c801e8a117145c1da4e02ca426747ccfb2c0108;hp=fd8b97d24e721fe799ee3f9143ad4fd5d484d64c;hb=5fc6c3e42b91af11aa1323f6cfde4d27bbea9ec8;hpb=05a3bbbe420e4afc76e0eea24ce32f859405dc4a

diff --git a/compress.c b/compress.c
index fd8b97d..6c801e8 100644
--- a/compress.c
+++ b/compress.c
@@ -7,16 +7,10 @@
  * 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/lib-lib.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 <lib-sys/unix.h>
 
 #include <lib-ui/curses.h>
 
@@ -149,13 +143,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];
 
@@ -230,7 +224,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);
@@ -318,8 +311,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);
@@ -367,8 +358,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);
@@ -399,8 +388,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
@@ -440,8 +427,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  debug_print (2, ("CompressCmd: '%s'\n", cmd));
-
   endwin ();
   fflush (stdout);