xterm.c was absurd, no need to put trivial functions like this in a

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index c3800df..2a5cadf 100644 (file)
--- 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"
 
@@ -377,7 +376,7 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
     /* not much point in classifying quotes... */
 
     if (*QuoteList == NULL) {
-      class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
+      class = p_new(struct q_class_t, 1);
       class->color = ColorQuote[0];
       *QuoteList = class;
     }
@@ -398,10 +397,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
         /* found shorter prefix */
         if (tmp == NULL) {
           /* add a node above q_list */
-          tmp =
-            (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-          tmp->prefix = (char *) mem_calloc (1, length + 1);
-          strncpy (tmp->prefix, qptr, length);
+          tmp = p_new(struct q_class_t, 1);
+          tmp->prefix = p_dupstr(qptr, length);
           tmp->length = length;
 
           /* replace q_list by tmp in the top level list */
@@ -501,11 +498,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
               /* found shorter common prefix */
               if (tmp == NULL) {
                 /* add a node above q_list */
-                tmp = (struct q_class_t *) mem_calloc (1,
-                                                        sizeof (struct
-                                                                q_class_t));
-                tmp->prefix = (char *) mem_calloc (1, length + 1);
-                strncpy (tmp->prefix, qptr, length);
+                tmp = p_new(struct q_class_t, 1);
+                tmp->prefix = p_dupstr(qptr, length);
                 tmp->length = length;
 
                 /* replace q_list by tmp */
@@ -598,10 +592,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
         /* still not found so far: add it as a sibling to the current node */
         if (class == NULL) {
-          tmp =
-            (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-          tmp->prefix = (char *) mem_calloc (1, length + 1);
-          strncpy (tmp->prefix, qptr, length);
+          tmp = p_new(struct q_class_t, 1);
+          tmp->prefix = p_dupstr(qptr, length);
           tmp->length = length;
 
           if (ptr->down) {
@@ -632,9 +624,8 @@ static struct q_class_t *classify_quote (struct q_class_t **QuoteList,
 
   if (class == NULL) {
     /* not found so far: add it as a top level class */
-    class = (struct q_class_t *) mem_calloc (1, sizeof (struct q_class_t));
-    class->prefix = (char *) mem_calloc (1, length + 1);
-    strncpy (class->prefix, qptr, length);
+    class = p_new(struct q_class_t, 1);
+    class->prefix = p_dupstr(qptr, length);
     class->length = length;
     new_class_color (class, q_level);
 
@@ -708,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;
     }
@@ -772,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;
@@ -1155,7 +1144,7 @@ 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));
       (*lineInfo)[ch].type = -1;
@@ -1232,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;
@@ -1756,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));
         }
@@ -2238,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));
         }