exit mem_realloc, enters p_realloc/xrealloc.

[apps/madmutt.git] / nntp / nntp.c

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 84e106f..34c035f 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -29,7 +29,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
 #include "lib/str.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
@@ -390,7 +389,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
         lenbuf = 0;
       }
 
-      mem_realloc (&inbuf, lenbuf + sizeof (buf));
+      p_realloc(&inbuf, lenbuf + sizeof (buf));
     }
     p_delete(&inbuf);
     funct (NULL, data);
@@ -713,7 +712,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
   fc.ctx = ctx;
   fc.base = first;
   fc.last = last;
-  fc.messages = mem_calloc (last - first + 1, sizeof (unsigned short));
+  fc.messages = p_new(unsigned short, last - first + 1);
 #if WANT_LISTGROUP_COMMAND
   if (nntp_data->nserv->hasLISTGROUP) {
     snprintf (buf, sizeof (buf), "LISTGROUP %s\r\n", nntp_data->group);
@@ -866,7 +865,7 @@ int nntp_open_mailbox (CONTEXT * ctx)
 
   /* create NNTP-specific state struct if nof found in list */
   if ((nntp_data = (NNTP_DATA *) hash_find (serv->newsgroups, buf)) == NULL) {
-    nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (buf) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
     nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
     strcpy (nntp_data->group, buf);
     hash_insert (serv->newsgroups, nntp_data->group, nntp_data, 0);
@@ -1236,7 +1235,7 @@ static int _nntp_check_mailbox (CONTEXT * ctx, NNTP_DATA * nntp_data)
     /* active was renumbered? */
     if (last < nntp_data->lastLoaded) {
       if (!nntp_data->max) {
-        nntp_data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+        nntp_data->entries = p_new(NEWSRC_ENTRY, 5);
         nntp_data->max = 5;
       }
       nntp_data->lastCached = 0;
@@ -1277,7 +1276,7 @@ static int add_group (char *buf, void *serv)
     return 0;
   if ((nntp_data = (NNTP_DATA *) hash_find (s->newsgroups, group)) == NULL) {
     n++;
-    nntp_data = mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
     nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
     strcpy (nntp_data->group, group);
     nntp_data->nserv = s;
@@ -1498,7 +1497,7 @@ static int check_children (char *s, void *c)
     if (cc->ctx->hdrs[i]->article_num == n)
       return 0;
   if (cc->num >= cc->max)
-    mem_realloc (&cc->child, sizeof (unsigned int) * (cc->max += 25));
+    p_realloc(&cc->child, cc->max += 25);
   cc->child[cc->num++] = n;
 
   return 0;