From: Richard Russon Date: Fri, 18 Mar 2016 22:38:18 +0000 (+0000) Subject: quieten two compiler warnings X-Git-Tag: neomutt-20160404~22^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=511aefdc041bda500cf9c52dd1fe0af75213d2e0;p=neomutt quieten two compiler warnings --- diff --git a/curs_main.c b/curs_main.c index a76aac998..0baaf6339 100644 --- a/curs_main.c +++ b/curs_main.c @@ -118,7 +118,9 @@ short mutt_ts_capability(void) { char *term = getenv("TERM"); char *tcaps; +#ifdef HAVE_USE_EXTENDED_NAMES int tcapi; +#endif char **termp; char *known[] = { "color-xterm", diff --git a/mbyte.c b/mbyte.c index 470686c9c..fb5718f8c 100644 --- a/mbyte.c +++ b/mbyte.c @@ -107,7 +107,7 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd) char buf[MB_LEN_MAX+1]; ICONV_CONST char *ib; char *ob; - size_t ibl, obl, r; + size_t ibl, obl; if (s) { @@ -117,7 +117,7 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd) ib = buf; ob = s; obl = MB_LEN_MAX; - r = iconv (cd, &ib, &ibl, &ob, &obl); + iconv (cd, &ib, &ibl, &ob, &obl); } else { @@ -125,7 +125,7 @@ static size_t wcrtomb_iconv (char *s, wchar_t wc, iconv_t cd) ibl = 1; ob = buf; obl = sizeof (buf); - r = iconv (cd, &ib, &ibl, &ob, &obl); + iconv (cd, &ib, &ibl, &ob, &obl); } return ob - s; }