build: fix minor code warnings / style

- remove an unnecessary backslash
- put variable in same preprocessor scope
- move prototype to where it's needed

diff --git a/imap/imap.c b/imap/imap.c
index a6632e2b4933cb29563328305a134cd14a974af0..d4dd2f35c08c98021b474922b3e32b3c1ebe4cd2 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -708,8 +708,8 @@ static int imap_open_mailbox (CONTEXT* ctx)
     goto fail;
 
   /* check for READ-ONLY notification */
-  if (!ascii_strncasecmp (imap_get_qualifier (idata->buf), "[READ-ONLY]", 11)  \
-  && !mutt_bit_isset (idata->capabilities, ACL))
+  if (!ascii_strncasecmp(imap_get_qualifier(idata->buf), "[READ-ONLY]", 11) &&
+      !mutt_bit_isset(idata->capabilities, ACL))
   {
     mutt_debug (2, "Mailbox is read-only.\n");
     ctx->readonly = 1;

diff --git a/mbyte.c b/mbyte.c
index 6ca4a0212a1a6cff02745a5a907219d29497fb87..c08185f60add3e536a95db4c003c70951fd87fd7 100644 (file)
--- a/mbyte.c
+++ b/mbyte.c
@@ -42,6 +42,10 @@ static iconv_t charset_to_utf8 = (iconv_t)(-1);
 static iconv_t charset_from_utf8 = (iconv_t)(-1);
 #endif
 
+#ifndef HAVE_WC_FUNCS
+static size_t utf8rtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *_ps);
+#endif
+
 void mutt_set_charset (char *charset)
 {
   char buffer[STRING];

diff --git a/mutt_ssl.c b/mutt_ssl.c
index 1115528e19490516db29a26473744abd8112f863..862d473c3d6c29753a93eba7d3eeff6732994133 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -103,8 +103,10 @@ static int ssl_load_certificates (SSL_CTX *ctx)
   FILE *fp;
   X509 *cert = NULL;
   X509_STORE *store;
-  char buf[STRING];
   int rv = 1;
+#ifdef DEBUG
+  char buf[STRING];
+#endif
 
   mutt_debug (2, "ssl_load_certificates: loading trusted certificates\n");
   store = SSL_CTX_get_cert_store (ctx);