X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=2c831cc5a8399af0323ce457af3e2376e7aa4f22;hp=8c01daa73af7122ebcbc8c3c8473f4d08a16c012;hb=c5f843d96b3889ba116e4b704e457a00bee63cb9;hpb=9a1805afc94b21d8766e6e67ef57f92aaf966e84

diff --git a/pager.c b/pager.c
index 8c01daa..2c831cc 100644
--- a/pager.c
+++ b/pager.c
@@ -39,6 +39,7 @@
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
+#include "lib/debug.h"
 
 #include <sys/stat.h>
 #include <ctype.h>
@@ -680,8 +681,8 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
   else if (check_attachment_marker ((char *) raw) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
 #endif
-  else if (safe_strcmp ("-- \n", buf) == 0
-           || safe_strcmp ("-- \r\n", buf) == 0) {
+  else if (mutt_strcmp ("-- \n", buf) == 0
+           || mutt_strcmp ("-- \r\n", buf) == 0) {
     i = n + 1;
 
     lineInfo[n].type = MT_COLOR_SIGNATURE;
@@ -915,7 +916,7 @@ fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf,
       }
       else if (*p == '\033' && *(p + 1) == ']'
                && check_attachment_marker ((char *) p) == 0) {
-        dprint (2, (debugfile, "fill_buffer: Seen attachment marker.\n"));
+        debug_print (2, ("seen attachment marker.\n"));
         while (*p++ != '\a')    /* skip pseudo-ANSI sequence */
           ;
       }
@@ -974,8 +975,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
     if (k == -2 || k == -1) {
-      dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
-                  __FILE__, __LINE__, k, errno));
+      debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
       if (col + 4 > wrap_cols)
         break;
       col += 4;