merge OPS that do not need to be split anymore.

[apps/madmutt.git] / compress.c

diff --git a/compress.c b/compress.c
index 21b3c14..e97fc8d 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -7,15 +7,7 @@
  * 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/lib-lib.h>
 
 #include <lib-sys/mutt_signal.h>
 #include <lib-sys/unix.h>
@@ -26,6 +18,7 @@
 
 #include "mx.h"
 #include "mbox.h"
+#include "compress.h"
 
 typedef struct {
   const char *close;            /* close-hook  command */
@@ -41,7 +34,7 @@ char echo_cmd[HUGE_STRING];
  * excl - exclusive lock?
  * retry - should retry if unable to lock?
  */
-int mbox_lock_compressed (CONTEXT * ctx, FILE * fp, int excl, int retry)
+static int mbox_lock_compressed (CONTEXT * ctx, FILE * fp, int excl, int retry)
 {
   int r;
 
@@ -55,7 +48,7 @@ int mbox_lock_compressed (CONTEXT * ctx, FILE * fp, int excl, int retry)
   return (r);
 }
 
-void mbox_unlock_compressed (CONTEXT * ctx, FILE * fp)
+static void mbox_unlock_compressed (CONTEXT * ctx, FILE * fp)
 {
   if (ctx->locked) {
     fflush (fp);
@@ -154,10 +147,10 @@ static void store_size (CONTEXT * ctx)
 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];
 
@@ -276,14 +269,14 @@ int mutt_open_read_compressed (CONTEXT * ctx)
   return (0);
 }
 
-void restore_path (CONTEXT * ctx)
+static void restore_path (CONTEXT * ctx)
 {
   p_delete(&ctx->path);
   ctx->path = ctx->realpath;
 }
 
 /* remove the temporary mailbox */
-void remove_file (CONTEXT * ctx)
+static void remove_file (CONTEXT * ctx)
 {
   if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
     remove (ctx->path);