X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=13f39080cf9aa356463cce9b51c439cf8b2b2282;hp=31f139af721413ad9cbfdf8da768720031a78a19;hb=2ea77d3b2827ba23feb756ce2fb936565ae38998;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/pager.c b/pager.c
index 31f139a..13f3908 100644
--- a/pager.c
+++ b/pager.c
@@ -16,6 +16,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -39,9 +41,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"
 
@@ -688,8 +687,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 (str_cmp ("-- \n", buf) == 0
-           || str_cmp ("-- \r\n", buf) == 0) {
+  else if (m_strcmp("-- \n", buf) == 0
+           || m_strcmp("-- \r\n", buf) == 0) {
     i = n + 1;
 
     lineInfo[n].type = MT_COLOR_SIGNATURE;
@@ -700,7 +699,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
       /* oops... */
       if (lineInfo[i].chunks) {
         lineInfo[i].chunks = 0;
-        mem_realloc (&(lineInfo[n].syntax), sizeof (struct syntax_t));
+        p_realloc(&(lineInfo[n].syntax), 1);
       }
       lineInfo[i++].type = MT_COLOR_SIGNATURE;
     }
@@ -764,9 +763,7 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
           if (pmatch[0].rm_eo != pmatch[0].rm_so) {
             if (!found) {
               if (++(lineInfo[n].chunks) > 1)
-                mem_realloc (&(lineInfo[n].syntax),
-                              (lineInfo[n].chunks) *
-                              sizeof (struct syntax_t));
+                p_realloc(&(lineInfo[n].syntax), lineInfo[n].chunks);
             }
             i = lineInfo[n].chunks - 1;
             pmatch[0].rm_so += offset;
@@ -890,7 +887,7 @@ static int trim_incomplete_mbyte(unsigned char *buf, size_t len) {
   mbstate_t mbstate;
   size_t k;
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   for (; len > 0; buf += k, len -= k) {
     k = mbrtowc (NULL, (char *) buf, len, &mbstate);
     if (k == -2) 
@@ -984,7 +981,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
     wrap_cols = COLS;
 
   /* FIXME: this should come from lineInfo */
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
 
   for (ch = 0, vch = 0; ch < cnt; ch += k, vch += k) {
     /* Handle ANSI sequences */
@@ -1147,9 +1144,9 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
   }
 
   if (*last == *max) {
-    mem_realloc (lineInfo, sizeof (struct line_t) * (*max += LINES));
+    p_realloc(lineInfo, *max += LINES);
     for (ch = *last; ch < *max; ch++) {
-      memset (&((*lineInfo)[ch]), 0, sizeof (struct line_t));
+      p_clear(&(*lineInfo)[ch], 1);
       (*lineInfo)[ch].type = -1;
       (*lineInfo)[ch].search_cnt = -1;
       (*lineInfo)[ch].syntax = p_new(struct syntax_t, 1);
@@ -1224,8 +1221,7 @@ display_line (FILE * f, off_t *last_pos, struct line_t **lineInfo, int n,
            (SearchRE, (char *) fmt + offset, 1, pmatch,
             (offset ? REG_NOTBOL : 0)) == 0) {
       if (++((*lineInfo)[n].search_cnt) > 1)
-        mem_realloc (&((*lineInfo)[n].search),
-                      ((*lineInfo)[n].search_cnt) * sizeof (struct syntax_t));
+        p_realloc(&(*lineInfo)[n].search, (*lineInfo)[n].search_cnt);
       else
         (*lineInfo)[n].search = p_new(struct syntax_t, 1);
       pmatch[0].rm_so += offset;
@@ -1466,7 +1462,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
   lineInfo = p_new(struct line_t, maxLine = LINES);
   for (i = 0; i < maxLine; i++) {
-    memset (&lineInfo[i], 0, sizeof (struct line_t));
+    p_clear(&lineInfo[i], 1);
     lineInfo[i].type = -1;
     lineInfo[i].search_cnt = -1;
     lineInfo[i].syntax = p_new(struct syntax_t, 1);
@@ -1748,7 +1744,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
           lineInfo[i].search_cnt = -1;
           lineInfo[i].quote = NULL;
 
-          mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+          p_realloc(&lineInfo[i].syntax, 1);
           if (SearchCompiled && lineInfo[i].search)
             p_delete(&(lineInfo[i].search));
         }
@@ -2230,7 +2226,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
           lineInfo[i].search_cnt = -1;
           lineInfo[i].quote = NULL;
 
-          mem_realloc (&(lineInfo[i].syntax), sizeof (struct syntax_t));
+          p_realloc(&(lineInfo[i].syntax), 1);
           if (SearchCompiled && lineInfo[i].search)
             p_delete(&(lineInfo[i].search));
         }