drop unreachable condition

diff --git a/hdrline.c b/hdrline.c
index cd1f02c851043cd59a419d58a433893cf058de01..7d11324e5cd94565c64d0ae5ab4481e8716836e8 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -900,7 +900,7 @@ static const char *index_format_str(char *buf, size_t buflen, size_t col, int co
 
       colorlen = add_index_color(buf, buflen, flags, MT_COLOR_INDEX_TAGS);
       if (i)
-        mutt_format_s(buf + colorlen, buflen - colorlen, prec, NONULL(tags));
+        mutt_format_s(buf + colorlen, buflen - colorlen, prec, tags);
       else
         mutt_format_s(buf + colorlen, buflen - colorlen, prec, "");
       add_index_color(buf + colorlen, buflen - colorlen, flags, MT_COLOR_INDEX);

diff --git a/imap/utf7.c b/imap/utf7.c
index b3269a265b9c04d803b13af097ec470e5bdb78d6..5da5d6a2f30908f445bd8e105dfbc6d1a971332b 100644 (file)
--- a/imap/utf7.c
+++ b/imap/utf7.c
@@ -285,12 +285,6 @@ static char *utf8_to_utf7(const char *u8, size_t u8len, char **u7, size_t *u7len
     }
   }
 
-  if (u8len)
-  {
-    FREE(&buf);
-    return 0;
-  }
-
   if (base64)
   {
     if (k > 10)

diff --git a/mutt/string.c b/mutt/string.c
index 76d55d2b45a603502aac799348cb9b155746e023..cd40b0289510e0deb8db97dc687b0ab6e1eeded3 100644 (file)
--- a/mutt/string.c
+++ b/mutt/string.c
@@ -885,7 +885,7 @@ void mutt_str_pretty_size(char *buf, size_t buflen, size_t num)
   }
   else if (num < 10189) /* 0.1K - 9.9K */
   {
-    snprintf(buf, buflen, "%3.1fK", (num < 103) ? 0.1 : (num / 1024.0));
+    snprintf(buf, buflen, "%3.1fK", num / 1024.0);
   }
   else if (num < 1023949) /* 10K - 999K */
   {

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 0f56494d345ad0703dc1bd862b69052280553b25..012a70caf71a80f4efca46739a551adae270f66a 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -3739,8 +3739,8 @@ static void print_key_info(gpgme_key_t key, FILE *fp)
         putc(s[1], fp);
         putc(s[2], fp);
         putc(s[3], fp);
-        putc(is_pgp ? ' ' : ':', fp);
-        if (is_pgp && i == 4)
+        putc(' ', fp);
+        if (i == 4)
           putc(' ', fp);
       }
     }

diff --git a/rfc3676.c b/rfc3676.c
index a261cbf6038e3ad1a1b747190bf4ecf15564818b..9383584947a53c6edb58f2f36831d061468a70ce 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -200,7 +200,7 @@ static void print_flowed_line(char *line, struct State *s, int ql,
   width = quote_width(s, ql);
   last = line[mutt_str_strlen(line) - 1];
 
-  mutt_debug(4, "f=f: line [%s], width = %ld, spaces = %lu\n", NONULL(line),
+  mutt_debug(4, "f=f: line [%s], width = %ld, spaces = %lu\n", line,
              (long) width, fst->spaces);
 
   for (p = (char *) line, words = 0; (p = strsep(&line, " ")) != NULL;)

diff --git a/sendlib.c b/sendlib.c
index fcdef69391759654b0fe608487eadb1a87278cb7..9aedea59b22ca2a40416322bc351b9475fed1a2a 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1315,7 +1315,7 @@ char *mutt_get_body_charset(char *d, size_t dlen, struct Body *b)
     p = mutt_param_get("charset", b->parameter);
 
   if (p)
-    mutt_ch_canonical_charset(d, dlen, NONULL(p));
+    mutt_ch_canonical_charset(d, dlen, p);
   else
     mutt_str_strfcpy(d, "us-ascii", dlen);