simplifications

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index 92e6fa6..e0047a5 100644 (file)
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -12,13 +12,13 @@
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
+#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
 #include "alias.h"
 #include "sort.h"
 #include "thread.h"
 #include "charset.h"
-#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 int mutt_is_mail_list (address_t * addr)
@@ -578,9 +578,7 @@ hdr_format_str(char *dest, ssize_t destlen,
   case 'T':
     snprintf (fmt, sizeof (fmt), "%%%sc", prefix);
     snprintf (dest, destlen, fmt,
-              (Tochars
-               && ((i = mutt_user_is_recipient (hdr))) <
-               m_strlen(Tochars)) ? Tochars[i] : ' ');
+              ((i = mutt_user_is_recipient(hdr)) < m_strlen(Tochars)) ? Tochars[i] : ' ');
     break;
 
   case 'u':
@@ -657,8 +655,7 @@ hdr_format_str(char *dest, ssize_t destlen,
               hdr->deleted ? 'D' : (hdr->attach_del ? 'd' : ch),
               hdr->tagged ? '*'
               : (hdr->flagged ? '!'
-                 : (Tochars && ((i = mutt_user_is_recipient(hdr)) < m_strlen(Tochars))
-                    ?  Tochars[i] : ' ')));
+                 : ((i = mutt_user_is_recipient(hdr)) < m_strlen(Tochars) ?  Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;