X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hdrline.c;h=2ba1266f8f93b22604a8d60e4fbca2d0442249cf;hp=bd83a437daa3decd3a4775f16762884e2c5003b3;hb=b07d69b15852a06183f7b2298436e18150c36958;hpb=d2facf5ade8ae6d0831a2b8496b2c1017a935172

diff --git a/hdrline.c b/hdrline.c
index bd83a43..2ba1266 100644
--- a/hdrline.c
+++ b/hdrline.c
@@ -20,7 +20,7 @@
 #include "mutt_idna.h"
 #include "mime.h"
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
 #include "lib/rx.h"
 
 #include <ctype.h>
@@ -48,7 +48,7 @@ int mutt_is_subscribed_list (ADDRESS * addr)
  * return 1.  Otherwise, simply return 0.
  */
 static int
-check_for_mailing_list (ADDRESS * adr, char *pfx, char *buf, int buflen)
+check_for_mailing_list (ADDRESS * adr, const char *pfx, char *buf, int buflen)
 {
   for (; adr; adr = adr->next) {
     if (mutt_is_subscribed_list (adr)) {
@@ -590,7 +590,7 @@ static const char *hdr_format_str (char *dest,
     snprintf (dest, destlen, fmt,
               (Tochars
                && ((i = mutt_user_is_recipient (hdr))) <
-               str_len (Tochars)) ? Tochars[i] : ' ');
+               m_strlen(Tochars)) ? Tochars[i] : ' ');
     break;
 
   case 'u':
@@ -681,7 +681,7 @@ static const char *hdr_format_str (char *dest,
                                                     ((i =
                                                       mutt_user_is_recipient
                                                       (hdr)) <
-                                                     str_len (Tochars)) ?
+                                                     m_strlen(Tochars)) ?
                                                     Tochars[i] : ' ')));
     mutt_format_s (dest, destlen, prefix, buf2);
     break;