diff options
-rw-r--r-- | examples/base64.c | 6 | ||||
-rw-r--r-- | examples/http.c | 4 | ||||
-rw-r--r-- | lib/mailcap.c | 7 | ||||
-rw-r--r-- | libmailutils/base/Makefile.am | 2 | ||||
-rw-r--r-- | libmailutils/base/amd.c | 2 | ||||
-rw-r--r-- | libmailutils/base/wicket.c | 18 | ||||
-rw-r--r-- | libmailutils/cfg/Makefile.am | 2 | ||||
-rw-r--r-- | libmailutils/cfg/lexer.l | 3 | ||||
-rw-r--r-- | libmailutils/imapio/qstring.c | 2 | ||||
-rw-r--r-- | libmailutils/list/locate.c | 6 | ||||
-rw-r--r-- | libmailutils/list/replace.c | 6 | ||||
-rw-r--r-- | libmailutils/tests/fltst.c | 6 | ||||
-rw-r--r-- | libmailutils/tests/listop.c | 2 | ||||
-rw-r--r-- | libmu_sieve/sieve.l | 4 | ||||
-rw-r--r-- | libproto/imap/folder.c | 4 | ||||
-rw-r--r-- | maidag/lmtp.c | 10 | ||||
-rw-r--r-- | mail/send.c | 4 | ||||
-rw-r--r-- | mh/comp.c | 2 | ||||
-rw-r--r-- | mh/folder.c | 16 | ||||
-rw-r--r-- | mh/mh_alias.l | 3 | ||||
-rw-r--r-- | mh/mhn.c | 2 | ||||
-rw-r--r-- | mh/send.c | 5 | ||||
-rw-r--r-- | mimeview/mimetypes.l | 4 | ||||
-rw-r--r-- | mimeview/mimetypes.y | 2 |
24 files changed, 66 insertions, 56 deletions
diff --git a/examples/base64.c b/examples/base64.c index 0d9b66e95..8f9e05160 100644 --- a/examples/base64.c +++ b/examples/base64.c @@ -56,16 +56,14 @@ c_copy (mu_stream_t out, mu_stream_t in) while (mu_stream_read (in, &c, 1, &size) == 0 && size > 0) { - int rc; - if (printable && !ISPRINT (c)) { char outbuf[24]; sprintf (outbuf, "\\%03o", (unsigned char) c); - rc = mu_stream_write (out, outbuf, strlen (outbuf), NULL); + MU_ASSERT (mu_stream_write (out, outbuf, strlen (outbuf), NULL)); } else - rc = mu_stream_write (out, &c, 1, NULL); + MU_ASSERT (mu_stream_write (out, &c, 1, NULL)); } } else diff --git a/examples/http.c b/examples/http.c index 60d5a69e8..b54ab363a 100644 --- a/examples/http.c +++ b/examples/http.c @@ -72,7 +72,7 @@ main (int argc, char **argv) { int ret; mu_stream_t stream; - size_t nb, size; + size_t nb; size_t attempt; char *url = "www.gnu.org"; @@ -110,7 +110,7 @@ main (int argc, char **argv) exit (EXIT_FAILURE); } - for (attempt = 0, size = strlen (wbuf);; ) + for (attempt = 0;; ) { ret = mu_stream_write (stream, wbuf, strlen (wbuf), NULL); if (ret == 0) diff --git a/lib/mailcap.c b/lib/mailcap.c index 24ef3a077..795d3feb8 100644 --- a/lib/mailcap.c +++ b/lib/mailcap.c @@ -423,13 +423,11 @@ create_filter (char *cmd, int outfd, int *infd) { /* Child process */ struct mu_wordsplit ws; - int argc; char **argv; if (need_shell_p (cmd)) { char *x_argv[4]; - argc = 3; argv = x_argv; argv[0] = getenv ("SHELL"); argv[1] = "-c"; @@ -444,7 +442,6 @@ create_filter (char *cmd, int outfd, int *infd) mu_wordsplit_strerror (&ws)); _exit (127); } - argc = ws.ws_wordc; argv = ws.ws_wordv; } /* Create input channel: */ @@ -541,7 +538,7 @@ run_mailcap (mu_mailcap_entry_t entry, struct mime_context *ctx) int fd; int *pfd = NULL; int outfd = -1; - pid_t pid, pager_pid; + pid_t pid; if (ctx->debug_level > 1) dump_mailcap_entry (entry); @@ -582,7 +579,7 @@ run_mailcap (mu_mailcap_entry_t entry, struct mime_context *ctx) flag = 0; if (interactive_p (ctx) && mu_mailcap_entry_copiousoutput (entry, &flag) == 0 && flag) - pager_pid = create_filter (get_pager (), -1, &outfd); + create_filter (get_pager (), -1, &outfd); pid = create_filter (view_command, outfd, pfd); if (pid > 0) diff --git a/libmailutils/base/Makefile.am b/libmailutils/base/Makefile.am index 8c925bfbd..c7052c352 100644 --- a/libmailutils/base/Makefile.am +++ b/libmailutils/base/Makefile.am @@ -79,7 +79,7 @@ AM_CPPFLAGS = \ YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap AM_YFLAGS=-vt -AM_LFLAGS=-dvp +AM_LFLAGS=-dp EXTRA_DIST = parsedate.y diff --git a/libmailutils/base/amd.c b/libmailutils/base/amd.c index 0340b120f..4722adcf0 100644 --- a/libmailutils/base/amd.c +++ b/libmailutils/base/amd.c @@ -1216,7 +1216,7 @@ _compute_mailbox_size_recursive (struct _amd_data *amd, const char *name, free (buf); closedir (dir); - return 0; + return status; } static int diff --git a/libmailutils/base/wicket.c b/libmailutils/base/wicket.c index a7b691fc4..3b4c66ffa 100644 --- a/libmailutils/base/wicket.c +++ b/libmailutils/base/wicket.c @@ -177,28 +177,30 @@ file_ticket_get_cred (mu_ticket_t ticket, mu_url_t url, const char *challenge, char **pplain, mu_secret_t *psec) { struct file_ticket *ft = mu_ticket_get_data (ticket); - + int rc = 0; + if (!ft->tickurl) { - int rc = mu_wicket_file_match_url (ft->filename, url, - MU_URL_PARSE_ALL, - &ft->tickurl); + rc = mu_wicket_file_match_url (ft->filename, url, + MU_URL_PARSE_ALL, + &ft->tickurl); if (rc) return rc; - } + } if (pplain) { if (ft->user) { *pplain = strdup (ft->user); if (!*pplain) - return ENOMEM; + rc = ENOMEM; } else - return mu_url_aget_user (ft->tickurl, pplain); + rc = mu_url_aget_user (ft->tickurl, pplain); } else - return mu_url_get_secret (ft->tickurl, psec); + rc = mu_url_get_secret (ft->tickurl, psec); + return rc; } static int diff --git a/libmailutils/cfg/Makefile.am b/libmailutils/cfg/Makefile.am index 1632350fc..bbe569942 100644 --- a/libmailutils/cfg/Makefile.am +++ b/libmailutils/cfg/Makefile.am @@ -40,7 +40,7 @@ BUILT_SOURCES = parser.c parser.h lexer.c YLWRAP = $(SHELL) $(mu_aux_dir)/gylwrap AM_YFLAGS=-vt -AM_LFLAGS=-dvp +AM_LFLAGS=-dp parser.c parser.h: $(srcdir)/parser.y $(YLWRAP) "$(YACC) $(AM_YFLAGS) -d" $< \ diff --git a/libmailutils/cfg/lexer.l b/libmailutils/cfg/lexer.l index 65ff65cd6..6e2d862dd 100644 --- a/libmailutils/cfg/lexer.l +++ b/libmailutils/cfg/lexer.l @@ -69,6 +69,9 @@ static mu_opool_t pool; %} +%option nounput +%option noinput + %x COMMENT ML STR WS [ \t\f][ \t\f]* diff --git a/libmailutils/imapio/qstring.c b/libmailutils/imapio/qstring.c index b47109ff0..b54f64b69 100644 --- a/libmailutils/imapio/qstring.c +++ b/libmailutils/imapio/qstring.c @@ -71,6 +71,8 @@ mu_imapio_send_qstring_unfold (struct _mu_imapio *io, const char *buffer, int rc; rc = mu_stream_write (io->_imap_stream, "\"", 1, NULL); + if (rc) + return rc; while (1) { mu_stream_write (io->_imap_stream, buffer, len, NULL); diff --git a/libmailutils/list/locate.c b/libmailutils/list/locate.c index 095987834..99cb44084 100644 --- a/libmailutils/list/locate.c +++ b/libmailutils/list/locate.c @@ -32,7 +32,7 @@ _mu_list_ptr_comparator (const void *item, const void *value) int mu_list_locate (mu_list_t list, void *item, void **ret_item) { - struct list_data *current, *previous; + struct list_data *current; mu_list_comparator_t comp; int status = MU_ERR_NOENT; @@ -40,8 +40,8 @@ mu_list_locate (mu_list_t list, void *item, void **ret_item) return EINVAL; comp = list->comp ? list->comp : _mu_list_ptr_comparator; mu_monitor_wrlock (list->monitor); - for (previous = &list->head, current = list->head.next; - current != &list->head; previous = current, current = current->next) + for (current = list->head.next; current != &list->head; + current = current->next) { if (comp (current->item, item) == 0) { diff --git a/libmailutils/list/replace.c b/libmailutils/list/replace.c index e3d5aeceb..d9aa7bc59 100644 --- a/libmailutils/list/replace.c +++ b/libmailutils/list/replace.c @@ -26,7 +26,7 @@ int mu_list_replace (mu_list_t list, void *old_item, void *new_item) { - struct list_data *current, *previous; + struct list_data *current; mu_list_comparator_t comp; int status = MU_ERR_NOENT; @@ -34,8 +34,8 @@ mu_list_replace (mu_list_t list, void *old_item, void *new_item) return EINVAL; comp = list->comp ? list->comp : _mu_list_ptr_comparator; mu_monitor_wrlock (list->monitor); - for (previous = &list->head, current = list->head.next; - current != &list->head; previous = current, current = current->next) + for (current = list->head.next; current != &list->head; + current = current->next) { if (comp (current->item, old_item) == 0) { diff --git a/libmailutils/tests/fltst.c b/libmailutils/tests/fltst.c index ad9723f8b..591b8acdf 100644 --- a/libmailutils/tests/fltst.c +++ b/libmailutils/tests/fltst.c @@ -51,16 +51,14 @@ c_copy (mu_stream_t out, mu_stream_t in) while (mu_stream_read (in, &c, 1, &size) == 0 && size > 0) { - int rc; - if (printable && !ISPRINT (c)) { char outbuf[24]; sprintf (outbuf, "\\%03o", (unsigned char) c); - rc = mu_stream_write (out, outbuf, strlen (outbuf), NULL); + MU_ASSERT (mu_stream_write (out, outbuf, strlen (outbuf), NULL)); } else - rc = mu_stream_write (out, &c, 1, NULL); + MU_ASSERT (mu_stream_write (out, &c, 1, NULL)); } } else diff --git a/libmailutils/tests/listop.c b/libmailutils/tests/listop.c index 3f192bd72..9349f8f65 100644 --- a/libmailutils/tests/listop.c +++ b/libmailutils/tests/listop.c @@ -332,6 +332,8 @@ ictl_ins (mu_iterator_t itr, int argc, char **argv) rc = mu_iterator_ctl (itr, mu_itrctl_insert_list, tmp); mu_list_destroy (&tmp); } + if (rc) + printf ("%s\n", mu_strerror (rc)); } void diff --git a/libmu_sieve/sieve.l b/libmu_sieve/sieve.l index 742ef7f35..279849b2a 100644 --- a/libmu_sieve/sieve.l +++ b/libmu_sieve/sieve.l @@ -213,6 +213,10 @@ pop_source () return 0; } %} + +%option nounput +%option noinput + %x COMMENT ML STR WS [ \t][ \t]* diff --git a/libproto/imap/folder.c b/libproto/imap/folder.c index a2caa6d88..23696223e 100644 --- a/libproto/imap/folder.c +++ b/libproto/imap/folder.c @@ -64,9 +64,11 @@ _mu_folder_preauth_callback (void *data, int code, size_t sdat, void *pdat) static void _mu_folder_bye_callback (void *data, int code, size_t sdat, void *pdat) { +#if 0 mu_folder_t folder = data; - const char *text = pdat; mu_imap_t imap = folder->data; +#endif + const char *text = pdat; mu_debug (MU_DEBCAT_FOLDER, MU_DEBUG_TRACE1, (_("IMAP server closing connection: %s"), text)); /*FIXME: mu_imap_disconnect (imap);*/ diff --git a/maidag/lmtp.c b/maidag/lmtp.c index f69a5acdb..c7e4ab0f1 100644 --- a/maidag/lmtp.c +++ b/maidag/lmtp.c @@ -654,18 +654,18 @@ int maidag_lmtp_server () { int rc = lmtp_set_privs (); + if (rc) return rc; if (mu_m_server_mode (server) == MODE_DAEMON) { - int status; mu_m_server_begin (server); - status = mu_m_server_run (server); + rc = mu_m_server_run (server); + if (rc) + rc = EX_CONFIG; mu_m_server_end (server); mu_m_server_destroy (&server); - if (status) - return EX_CONFIG; } else { @@ -701,6 +701,6 @@ maidag_lmtp_server () rc = lmtp_loop (str, 0); mu_stream_destroy (&str); - return rc; } + return rc; } diff --git a/mail/send.c b/mail/send.c index dbf5d34b2..abab4c4b2 100644 --- a/mail/send.c +++ b/mail/send.c @@ -915,7 +915,6 @@ mail_send0 (compose_env_t *env, int save_to) else { struct mu_wordsplit ws; - int status; if (mu_wordsplit (buf + 1, &ws, MU_WRDSF_DEFFLAGS) == 0) { @@ -925,8 +924,7 @@ mail_send0 (compose_env_t *env, int save_to) mail_find_escape (ws.ws_wordv[0]); if (entry) - status = (*entry->escfunc) (ws.ws_wordc, ws.ws_wordv, - env); + (*entry->escfunc) (ws.ws_wordc, ws.ws_wordv, env); else mu_error (_("Unknown escape %s"), ws.ws_wordv[0]); } @@ -258,7 +258,7 @@ main (int argc, char **argv) mu_error (_("only one message at a time!")); return 1; } - draftmessage = mu_umaxtostr (0, mh_msgset_first_uid (msgset)); + draftmessage = (char*) mu_umaxtostr (0, mh_msgset_first_uid (msgset)); mu_msgset_free (msgset); mu_mailbox_destroy (&mbox); } diff --git a/mh/folder.c b/mh/folder.c index 12108563e..0810a2917 100644 --- a/mh/folder.c +++ b/mh/folder.c @@ -246,7 +246,7 @@ size_t message_count; /* Total number of messages */ int name_prefix_len; /* Length of the mu_path_folder_dir */ void -install_folder_info (const char *name, struct folder_info *info) +install_folder_info (const char *name, struct folder_info const *info) { struct folder_info *new_info = mu_alloc (sizeof (*new_info)); *new_info = *info; @@ -315,7 +315,7 @@ _scan (const char *name, size_t depth) if (fast_mode && depth > 0) { memset (&info, 0, sizeof (info)); - info.name = name; + info.name = (char*) name; install_folder_info (name, &info); closedir (dir); return; @@ -770,7 +770,7 @@ pack_xlate (struct pack_tab *pack_tab, size_t count, size_t n) return p ? p->new : 0; } -static int +static void _fixup (const char *name, const char *value, struct fixup_data *fd, int flags) { size_t i; @@ -785,7 +785,7 @@ _fixup (const char *name, const char *value, struct fixup_data *fd, int flags) { mu_error (_("cannot split line `%s': %s"), value, mu_wordsplit_strerror (&ws)); - return 0; + return; } rc = mu_msgset_create (&msgset, fd->mbox, MU_MSGSET_UID); @@ -820,14 +820,13 @@ _fixup (const char *name, const char *value, struct fixup_data *fd, int flags) const char *p = mh_seq_read (fd->mbox, name, flags); fprintf (stderr, "Sequence %s: %s\n", name, p); } - - return 0; } static int fixup_global (const char *name, const char *value, void *data) { - return _fixup (name, value, data, 0); + _fixup (name, value, data, 0); + return 0; } static int @@ -842,11 +841,10 @@ fixup_private (const char *name, const char *value, void *data) nlen = strlen (name) - strlen (fd->folder_dir); if (nlen > 0 && strcmp (name + nlen, fd->folder_dir) == 0) { - int rc; char *s = mu_alloc (nlen); memcpy (s, name, nlen - 1); s[nlen-1] = 0; - rc = _fixup (s, value, fd, SEQ_PRIVATE); + _fixup (s, value, fd, SEQ_PRIVATE); free (s); } return 0; diff --git a/mh/mh_alias.l b/mh/mh_alias.l index e54bf4e53..ffb2e283b 100644 --- a/mh/mh_alias.l +++ b/mh/mh_alias.l @@ -370,6 +370,9 @@ pop_source () extern int yyparse (void); %} +%option nounput +%option noinput + WS [ \t]+ WORD [^ \t\n,:;<+=\*]+ SPEC [,:;+=\*] @@ -1936,7 +1936,6 @@ parse_content_type (struct compose_env *env, { int status = 0, stop = 0; char *rest = *prest; - char *sp; char *comment = NULL; while (stop == 0 && status == 0 && *rest) @@ -1993,7 +1992,6 @@ parse_content_type (struct compose_env *env, mu_opool_append_char (pool, ';'); mu_opool_append_char (pool, ' '); skipws (rest); - sp = rest; for (; *rest && !mu_isspace (*rest) && *rest != '='; rest++) mu_opool_append_char (pool, *rest); skipws (rest); @@ -879,8 +879,9 @@ main (int argc, char **argv) if (mu_list_is_empty (mesg_list) && argc == 0) { char *dfolder = - (!use_draft && use_draftfolder) ? - mh_global_profile_get ("Draft-Folder", NULL) : NULL; + (!use_draft && use_draftfolder) + ? (char*) mh_global_profile_get ("Draft-Folder", NULL) + : NULL; if (dfolder) addfolder (dfolder, 0, NULL); diff --git a/mimeview/mimetypes.l b/mimeview/mimetypes.l index c28818abf..c90cc0c68 100644 --- a/mimeview/mimetypes.l +++ b/mimeview/mimetypes.l @@ -44,6 +44,10 @@ digit_to_number (char c) c-'a'+10); } %} + +%option nounput +%option noinput + %x ARGS HEX X [0-9a-fA-F] IDENT [a-zA-Z_\.][a-zA-Z0-9_\.-]* diff --git a/mimeview/mimetypes.y b/mimeview/mimetypes.y index 5ad8d53e4..8c128230c 100644 --- a/mimeview/mimetypes.y +++ b/mimeview/mimetypes.y @@ -231,7 +231,7 @@ mimetypes_parse (const char *name) return 1; rc = yyparse (); mimetypes_close (); - return rule_list == NULL; + return rc || rule_list == NULL; } void |