From 74697a5c38af6a85ce3b0062d781c35814a9f536 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Sat, 18 Nov 2006 21:34:47 +0100 Subject: [PATCH] rework compress_info type a bit. avoid ugly casts. Signed-off-by: Pierre Habouzit --- compress.c | 70 ++++++++++++++++++---------------------------- lib-ui/curs_main.c | 2 +- lib-ui/status.c | 11 ++++---- mbox.c | 2 +- mutt.h | 4 ++- mx.c | 8 +++--- 6 files changed, 41 insertions(+), 56 deletions(-) diff --git a/compress.c b/compress.c index f4b8b67..3770fef 100644 --- a/compress.c +++ b/compress.c @@ -20,12 +20,12 @@ #include "mbox.h" #include "compress.h" -typedef struct { +struct compress_info { const char *close; /* close-hook command */ const char *open; /* open-hook command */ const char *append; /* append-hook command */ off_t size; /* size of real folder */ -} COMPRESS_INFO; +}; char echo_cmd[HUGE_STRING]; @@ -80,9 +80,7 @@ int mutt_can_read_compressed (const char *path) */ static const char *get_append_command (const char *path, const CONTEXT * ctx) { - COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; - - return (is_new (path)) ? ci->close : ci->append; + return is_new(path) ? ctx->cinfo->close : ctx->cinfo->append; } int mutt_can_append_compressed (const char *path) @@ -103,17 +101,16 @@ int mutt_can_append_compressed (const char *path) } /* open a compressed mailbox */ -static COMPRESS_INFO *set_compress_info (CONTEXT * ctx) +static compress_info *set_compress_info (CONTEXT * ctx) { - COMPRESS_INFO *ci; + compress_info *ci = p_new(compress_info, 1); /* Now lets uncompress this thing */ - ci = p_new(COMPRESS_INFO, 1); - ctx->compressinfo = (void *) ci; ci->append = find_compress_hook (M_APPENDHOOK, ctx->path); ci->open = find_compress_hook (M_OPENHOOK, ctx->path); ci->close = find_compress_hook (M_CLOSEHOOK, ctx->path); - return ci; + + return (ctx->cinfo = ci); } static void set_path (CONTEXT * ctx) @@ -137,13 +134,6 @@ static int get_size (const char *path) return (sb.st_size); } -static void store_size (CONTEXT * ctx) -{ - COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; - - ci->size = get_size (ctx->realpath); -} - static const char *compresshook_format_str (char *dest, ssize_t destlen, char op, const char *src, const char *fmt, @@ -188,10 +178,8 @@ static char *get_compression_cmd (const char *cmd, const CONTEXT * ctx) int mutt_check_mailbox_compressed (CONTEXT * ctx) { - COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; - - if (ci->size != get_size (ctx->realpath)) { - p_delete(&ctx->compressinfo); + if (ctx->cinfo->size != get_size (ctx->realpath)) { + p_delete(&ctx->cinfo); p_delete(&ctx->realpath); mutt_error _("Mailbox was corrupted!"); @@ -206,18 +194,18 @@ int mutt_open_read_compressed (CONTEXT * ctx) FILE *fp; int rc; - COMPRESS_INFO *ci = set_compress_info (ctx); + compress_info *ci = set_compress_info (ctx); if (!ci->open) { ctx->magic = 0; - p_delete(&ctx->compressinfo); + p_delete(&ctx->cinfo); return (-1); } if (!ci->close || access (ctx->path, W_OK) != 0) ctx->readonly = 1; set_path (ctx); - store_size (ctx); + ctx->cinfo->size = get_size(ctx->realpath); if (!ctx->quiet) mutt_message (_("Decompressing %s..."), ctx->realpath); @@ -253,9 +241,8 @@ int mutt_open_read_compressed (CONTEXT * ctx) if (rc) { mutt_any_key_to_continue (NULL); ctx->magic = 0; - p_delete(&ctx->compressinfo); - mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), - cmd); + p_delete(&ctx->cinfo); + mutt_error(_("Error executing: %s : unable to open the mailbox!\n"), cmd); } p_delete(&cmd); if (rc) @@ -285,14 +272,14 @@ static void remove_file (CONTEXT * ctx) int mutt_open_append_compressed (CONTEXT * ctx) { FILE *fh; - COMPRESS_INFO *ci = set_compress_info (ctx); + compress_info *ci = set_compress_info (ctx); if (!get_append_command (ctx->path, ctx)) { if (ci->open && ci->close) return (mutt_open_read_compressed (ctx)); ctx->magic = 0; - p_delete(&ctx->compressinfo); + p_delete(&ctx->cinfo); return (-1); } @@ -312,7 +299,7 @@ int mutt_open_append_compressed (CONTEXT * ctx) /* close a compressed mailbox */ void mutt_fast_close_compressed (CONTEXT * ctx) { - if (ctx->compressinfo) { + if (ctx->cinfo) { if (ctx->fp) fclose (ctx->fp); ctx->fp = NULL; @@ -323,7 +310,7 @@ void mutt_fast_close_compressed (CONTEXT * ctx) remove_file (ctx); restore_path (ctx); - p_delete(&ctx->compressinfo); + p_delete(&ctx->cinfo); } } @@ -333,12 +320,11 @@ int mutt_sync_compressed (CONTEXT * ctx) char *cmd; int rc = 0; FILE *fp; - COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; if (!ctx->quiet) mutt_message (_("Compressing %s..."), ctx->realpath); - cmd = get_compression_cmd (ci->close, ctx); + cmd = get_compression_cmd (ctx->cinfo->close, ctx); if (cmd == NULL) return (-1); @@ -353,7 +339,7 @@ int mutt_sync_compressed (CONTEXT * ctx) mutt_unblock_signals (); mutt_error _("Unable to lock mailbox!"); - store_size (ctx); + ctx->cinfo->size = get_size(ctx->realpath); p_delete(&cmd); return (-1); @@ -377,7 +363,7 @@ int mutt_sync_compressed (CONTEXT * ctx) p_delete(&cmd); - store_size (ctx); + ctx->cinfo->size = get_size(ctx->realpath); return (rc); } @@ -387,13 +373,12 @@ int mutt_slow_close_compressed (CONTEXT * ctx) FILE *fp; const char *append; char *cmd; - COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; + compress_info *ci = ctx->cinfo; 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 - * called - */ + || (append = ci->close)))) { + /* if we can not or should not append, we only have to remove the + compressed info, because sync was already called */ mutt_fast_close_compressed (ctx); return (0); } @@ -440,8 +425,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) if (mutt_system (cmd)) { mutt_any_key_to_continue (NULL); - mutt_error (_ - (" %s: Error compressing mailbox! Uncompressed one kept!\n"), + mutt_error (_(" %s: Error compressing mailbox! Uncompressed one kept!\n"), ctx->path); p_delete(&cmd); mbox_unlock_compressed (ctx, fp); @@ -456,7 +440,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) remove_file (ctx); restore_path (ctx); p_delete(&cmd); - p_delete(&ctx->compressinfo); + p_delete(&ctx->cinfo); return (0); } diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c index e23764e..fdce20e 100644 --- a/lib-ui/curs_main.c +++ b/lib-ui/curs_main.c @@ -1210,7 +1210,7 @@ int mutt_index_menu (void) if (Context) { int check; - if (Context->compressinfo && Context->realpath) + if (Context->cinfo && Context->realpath) m_strreplace(&LastFolder, Context->realpath); else m_strreplace(&LastFolder, Context->path); diff --git a/lib-ui/status.c b/lib-ui/status.c index 2dbf7e7..28b1329 100644 --- a/lib-ui/status.c +++ b/lib-ui/status.c @@ -70,7 +70,7 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op, case 'B': snprintf (fmt, sizeof (fmt), "%%%ss", prefix); - if (Context && Context->compressinfo && Context->realpath) { + if (Context && Context->cinfo && Context->realpath) { if ((p = strrchr (Context->realpath, '/'))) m_strcpy(tmp, sizeof(tmp), p + 1); else @@ -104,17 +104,16 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op, case 'f': snprintf (fmt, sizeof (fmt), "%%%ss", prefix); - if (Context && Context->compressinfo && Context->realpath) { + if (Context && Context->cinfo && Context->realpath) { m_strcpy(tmp, sizeof(tmp), Context->realpath); mutt_pretty_mailbox (tmp); - } - else + } else if (Context && Context->path) { m_strcpy(tmp, sizeof(tmp), Context->path); mutt_pretty_mailbox (tmp); - } - else + } else { m_strcpy(tmp, sizeof(tmp), _("(no mailbox)")); + } snprintf (buf, buflen, fmt, tmp); break; diff --git a/mbox.c b/mbox.c index 3832eee..79658fa 100644 --- a/mbox.c +++ b/mbox.c @@ -811,7 +811,7 @@ int mbox_close_mailbox (CONTEXT * ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); - if (ctx->compressinfo) + if (ctx->cinfo) mutt_slow_close_compressed (ctx); mutt_unblock_signals (); diff --git a/mutt.h b/mutt.h index 39bd444..b7ab1b6 100644 --- a/mutt.h +++ b/mutt.h @@ -515,6 +515,8 @@ typedef struct pattern_t { regex_t *rx; } pattern_t; +typedef struct compress_info compress_info; + typedef struct { char *path; FILE *fp; @@ -545,7 +547,7 @@ typedef struct { short magic; /* mailbox type */ - void *compressinfo; /* compressed mbox module private data */ + compress_info *cinfo; /* compressed mbox module private data */ char *realpath; /* path to compressed mailbox */ unsigned int locked:1; /* is the mailbox locked? */ diff --git a/mx.c b/mx.c index 6ee2be7..3d10313 100644 --- a/mx.c +++ b/mx.c @@ -561,7 +561,7 @@ void mx_fastclose_mailbox (CONTEXT * ctx) p_delete(&ctx->hdrs); p_delete(&ctx->v2r); - if (ctx->compressinfo) + if (ctx->cinfo) mutt_fast_close_compressed (ctx); p_delete(&ctx->path); @@ -584,7 +584,7 @@ static int sync_mailbox (CONTEXT * ctx, int *index_hint) /* the 1 is only of interest for IMAP and means EXPUNGE */ rc = mxfmts[ctx->magic-1]->mx_sync_mailbox(ctx,1,index_hint); - if (rc == 0 && ctx->compressinfo) + if (rc == 0 && ctx->cinfo) return mutt_sync_compressed (ctx); return rc; @@ -826,7 +826,7 @@ static int _mx_close_mailbox (CONTEXT * ctx, int *index_hint) !mutt_is_spool (ctx->path) && !option (OPTSAVEEMPTY)) mx_unlink_empty (ctx->path); - if (ctx->compressinfo && mutt_slow_close_compressed (ctx)) + if (ctx->cinfo && mutt_slow_close_compressed (ctx)) return (-1); mx_fastclose_mailbox (ctx); @@ -1093,7 +1093,7 @@ MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags) /* check for new mail */ int mx_check_mailbox (CONTEXT * ctx, int *index_hint, int lock) { - if (ctx->compressinfo) + if (ctx->cinfo) return mutt_check_mailbox_compressed (ctx); if (ctx) { -- 2.20.1