X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mx%2Fcompress.c;h=c92853b97d1ac86ecbc9e938fe4a107e7749f7b5;hp=00064b76d0f38aa1a4ae19f1f8f377b4876639d4;hb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b;hpb=3242c00b2d3f7f1c1554bcebfb8a390fddea095f diff --git a/lib-mx/compress.c b/lib-mx/compress.c index 00064b7..c92853b 100644 --- a/lib-mx/compress.c +++ b/lib-mx/compress.c @@ -137,14 +137,14 @@ static int get_size (const char *path) 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, + 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), cmd, compresshook_format_str, ctx, 0); + return m_strdup(buf); } int mutt_check_mailbox_compressed (CONTEXT * ctx)