X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mx%2Fcompress.c;h=044392ef496446ebd236aa45c33464f2e8bb0497;hb=3f35b8874fb10587ce43e2853a1ef95573222015;hp=00064b76d0f38aa1a4ae19f1f8f377b4876639d4;hpb=3242c00b2d3f7f1c1554bcebfb8a390fddea095f;p=apps%2Fmadmutt.git

diff --git a/lib-mx/compress.c b/lib-mx/compress.c
index 00064b7..044392e 100644
--- a/lib-mx/compress.c
+++ b/lib-mx/compress.c
@@ -134,17 +134,17 @@ static int get_size (const char *path)
   return (sb.st_size);
 }
 
-static const char *compresshook_format_str (char *dest, ssize_t destlen,
-                                            char op, const char *src,
-                                            const char *fmt,
-                                            const char *ifstring __attribute__ ((unused)),
-                                            const char *elsestring __attribute__ ((unused)),
-                                            unsigned long data,
-                                            format_flag flags __attribute__ ((unused)))
+static const char *
+compresshook_format_str(char *dest, ssize_t destlen,
+                        char op, const char *src, const char *fmt,
+                        const char *ifstr __attribute__ ((unused)),
+                        const char *elstr __attribute__ ((unused)),
+                        anytype data,
+                        format_flag flags __attribute__ ((unused)))
 {
   char tmp[STRING];
 
-  CONTEXT *ctx = (CONTEXT *) data;
+  CONTEXT *ctx = data.ptr;
 
   switch (op) {
   case 'f':
@@ -167,13 +167,11 @@ int mutt_test_compress_command (const char *cmd)
   return (strstr (cmd, "%f") && strstr (cmd, "%t")) ? 0 : -1;
 }
 
-static char *get_compression_cmd (const char *cmd, const CONTEXT * ctx)
+static char *get_compression_cmd(const char *cmd, const CONTEXT *ctx)
 {
-  char expanded[_POSIX_PATH_MAX];
-
-  m_strformat(expanded, sizeof (expanded), cmd, compresshook_format_str,
-              (unsigned long)ctx, 0);
-  return m_strdup(expanded);
+    char buf[_POSIX_PATH_MAX];
+    m_strformat(buf, sizeof(buf), 0, cmd, compresshook_format_str, (void*)ctx, 0);
+    return m_strdup(buf);
 }
 
 int mutt_check_mailbox_compressed (CONTEXT * ctx)