X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=967431691387b1eb427385483532a0c115a2e5f4;hb=23002a877577341cfd68687e58348e0ca01b1ac5;hp=84e106f86952dd650bea249c66dd22e53e310af6;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 84e106f..9674316 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -713,7 +713,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 +866,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 +1236,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 +1277,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;