From c7ceecd31e97891dd5cf48536d4bddf2c1d7d9dd Mon Sep 17 00:00:00 2001 From: pdmef Date: Sun, 13 Mar 2005 21:27:02 +0000 Subject: [PATCH 1/1] Rocco Rutte: fix compiler warnings git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@175 e385b8ad-14ed-0310-8656-cc95a2468c6d --- charset.c | 2 +- copy.c | 2 +- crypt.c | 1 - handler.c | 13 ++++++------- hcache.c | 4 ++++ imap/imap_private.h | 1 + imap/message.c | 1 - init.c | 2 ++ init.h | 4 +++- menu.c | 5 ++--- mh.c | 5 ++--- nntp.c | 2 +- recvattach.c | 3 +-- 13 files changed, 24 insertions(+), 21 deletions(-) diff --git a/charset.c b/charset.c index e17cca7..c211563 100644 --- a/charset.c +++ b/charset.c @@ -633,7 +633,7 @@ static size_t convert_string (ICONV_CONST char *f, size_t flen, *tlen = ob - buf; - safe_realloc ((void **) &buf, ob - buf + 1); + safe_realloc (&buf, ob - buf + 1); *t = buf; iconv_close (cd); diff --git a/copy.c b/copy.c index 3ce0f2e..9afdc25 100644 --- a/copy.c +++ b/copy.c @@ -417,7 +417,7 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix) /* clearing refs from memory */ for (t = refs; refs; refs = t->next, t = refs) - safe_free ((void **)&refs); + FREE(&refs); if (fputc ('\n', out) == EOF) return (-1); diff --git a/crypt.c b/crypt.c index 3eeaca7..9c0fc4c 100644 --- a/crypt.c +++ b/crypt.c @@ -110,7 +110,6 @@ static void disable_coredumps (void) int crypt_valid_passphrase(int flags) { - time_t now = time (NULL); int ret = 0; # if defined(HAVE_SETRLIMIT) &&(!defined(DEBUG)) diff --git a/handler.c b/handler.c index f82c717..5c05b0f 100644 --- a/handler.c +++ b/handler.c @@ -903,6 +903,12 @@ void text_enriched_handler (BODY *a, STATE *s) #define FLOWED_MAX 77 +#if 0 +static int flowed_maybe_quoted (char *cont) +{ + return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0; +} + static void flowed_quote (STATE *s, int level) { int i; @@ -919,11 +925,6 @@ static void flowed_quote (STATE *s, int level) state_putc ('>', s); } -static int flowed_maybe_quoted (char *cont) -{ - return regexec ((regex_t *) QuoteRegexp.rx, cont, 0, NULL, 0) == 0; -} - static void flowed_stuff (STATE *s, char *cont, int level) { if (!option (OPTTEXTFLOWED) && !(s->flags & M_DISPLAY)) @@ -966,7 +967,6 @@ static int flowed_visual_strlen (char *l, int i) return j; } -#if 0 static void text_plain_flowed_handler (BODY *a, STATE *s) { char line[LONG_STRING]; @@ -1208,7 +1208,6 @@ static int get_quote_level(char * line) { static void print_flowed_line(char * line, STATE *s,int ql) { int width; char * pos, * oldpos; - char * t; int len = strlen(line); int i; diff --git a/hcache.c b/hcache.c index dea409e..c34efd9 100644 --- a/hcache.c +++ b/hcache.c @@ -136,6 +136,7 @@ dump_char(char *c, unsigned char *d, int *off) return d; } +#if 0 static unsigned char * dump_char_size(char *c, unsigned char *d, int *off, ssize_t size) { @@ -152,6 +153,7 @@ dump_char_size(char *c, unsigned char *d, int *off, ssize_t size) return d; } +#endif static void restore_char(char **c, const unsigned char *d, int *off) @@ -251,6 +253,7 @@ restore_list(LIST **l, const unsigned char *d, int *off) *l = NULL; } +#if 0 static unsigned char * dump_buffer(BUFFER *b, unsigned char *d, int *off) { @@ -287,6 +290,7 @@ restore_buffer(BUFFER **b, const unsigned char *d, int *off) restore_int(& (*b)->dsize, d, off); restore_int((unsigned int *) & (*b)->destroy, d, off); } +#endif static unsigned char * dump_parameter(PARAMETER *p, unsigned char *d, int *off) diff --git a/imap/imap_private.h b/imap/imap_private.h index bbaf1ef..14b7ce4 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -204,6 +204,7 @@ int imap_parse_list_response(IMAP_DATA* idata, char** name, int* noselect, int* noinferiors, char* delim); int imap_read_literal (FILE* fp, IMAP_DATA* idata, long bytes); void imap_expunge_mailbox (IMAP_DATA* idata); +int imap_reconnect (CONTEXT* ctx); void imap_logout (IMAP_DATA* idata); /* auth.c */ diff --git a/imap/message.c b/imap/message.c index 3c5011c..e7e7a17 100644 --- a/imap/message.c +++ b/imap/message.c @@ -931,7 +931,6 @@ static size_t imap_hcache_keylen (const char *fn) static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp) { IMAP_DATA* idata; - long bytes; int rc = -1; /* default now is that string isn't FETCH response*/ idata = (IMAP_DATA*) ctx->data; diff --git a/init.c b/init.c index 5ac2110..0728ffe 100644 --- a/init.c +++ b/init.c @@ -652,6 +652,7 @@ static int parse_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err) return 0; } +#if 0 static int _parse_rx_list (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err, int flags) { do @@ -687,6 +688,7 @@ static int parse_rx_unlist (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER * return 0; } +#endif static void _alternates_clean (void) { diff --git a/init.h b/init.h index 194ad23..0512ca8 100644 --- a/init.h +++ b/init.h @@ -3660,10 +3660,12 @@ const struct mapping_t SortKeyMethods[] = { /* functions used to parse commands in a rc file */ static int parse_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); +#if 0 static int parse_rx_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); +static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); +#endif static int parse_spam_list (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); -static int parse_rx_unlist (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_lists (BUFFER *, BUFFER *, unsigned long, BUFFER *); static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *); diff --git a/menu.c b/menu.c index 7a8c834..a097c48 100644 --- a/menu.c +++ b/menu.c @@ -159,13 +159,12 @@ void menu_pad_string (char *s, size_t n) { int shift = option (OPTARROWCURSOR) ? 3 : 0; int cols = COLS - shift - SidebarWidth; - - char tmpbuf[n]; + char* tmpbuf = safe_malloc (n); mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, strlen (s), 1); tmpbuf[n - 1] = 0; - snprintf(s,n,"%s",tmpbuf); /* overkill */ + FREE(&tmpbuf); } void menu_redraw_full (MUTTMENU *menu) diff --git a/mh.c b/mh.c index 04d0c83..ae978e9 100644 --- a/mh.c +++ b/mh.c @@ -897,7 +897,6 @@ void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md) #if USE_HCACHE void *hc = NULL; void *data; - unsigned int size; struct timeval *when = NULL; struct stat lastchanged; int ret; @@ -1081,7 +1080,7 @@ int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr) FOREVER { snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%ld.%u_%d.%s%s", - dest->path, subdir, time (NULL), (unsigned int)getpid (), + dest->path, subdir, (long) time (NULL), (unsigned int)getpid (), Counter++, NONULL (Hostname), suffix); dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", @@ -1163,7 +1162,7 @@ int maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr) FOREVER { snprintf (path, _POSIX_PATH_MAX, "%s/%ld.%u_%d.%s%s", subdir, - time (NULL), (unsigned int)getpid (), Counter++, + (long) time (NULL), (unsigned int)getpid (), Counter++, NONULL (Hostname), suffix); snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path); diff --git a/nntp.c b/nntp.c index 4f03046..9c9a591 100644 --- a/nntp.c +++ b/nntp.c @@ -714,7 +714,7 @@ static int nntp_fetch_headers (CONTEXT *ctx, unsigned int first, * command on its own if !*buf */ buf[0] = '\0'; mutt_nntp_query (nntp_data, buf, sizeof (buf)); - if (sscanf (buf + 4, "%d %d %d %s", &num, &fc.first, &fc.last, buf) != 4) { + if (sscanf (buf + 4, "%d %u %u %s", &num, &fc.first, &fc.last, buf) != 4) { mutt_error (_("GROUP command failed: %s"), buf); FREE (&fc.messages); return (-1); diff --git a/recvattach.c b/recvattach.c index a143d14..e9da742 100644 --- a/recvattach.c +++ b/recvattach.c @@ -78,8 +78,7 @@ int mutt_extract_path(char *filename, char *path) } *help_ptr++=*filename++; } - safe_free((void **) &tmp); - + FREE(&tmp); return 0; } -- 2.20.1