X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnewsrc.c;h=fb5fc1bf6cd7a5c91389579a9a0866e64469cfe0;hp=3f707ab6812c0d1c4494b083c6a3436a0f59a074;hb=9274cbe8e6410ddb95ddc667faa678a29da85420;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 3f707ab..fb5fc1b 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -14,6 +14,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "mutt_curses.h"
@@ -25,9 +27,6 @@
 #include "rfc1524.h"
 #include "rfc2047.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <unistd.h>
@@ -44,7 +43,7 @@ void nntp_add_to_list (NNTP_SERVER * s, NNTP_DATA * d)
   if (!s || !d)
     return;
 
-  l = mem_calloc (1, sizeof (LIST));
+  l = p_new(LIST, 1);
   if (s->list)
     s->tail->next = l;
   else
@@ -76,8 +75,7 @@ static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
     len = sizeof (group);
   strfcpy (group, line, len);
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, group)) == NULL) {
-    data =
-      (NNTP_DATA *) mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+    data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
     data->group = (char *) data + sizeof (NNTP_DATA);
     strcpy (data->group, group);
     data->nserv = news;
@@ -92,7 +90,7 @@ static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
     p_delete(&data->entries);
 
   data->rc = 1;
-  data->entries = mem_calloc (x * 2, sizeof (NEWSRC_ENTRY));
+  data->entries = p_new(NEWSRC_ENTRY, x * 2);
   data->max = x * 2;
 
   if (*p == ':')
@@ -208,7 +206,7 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
     return 0;
   rewind (index);
   while (fgets (buf, sizeof (buf), index)) {
-    buf[str_len (buf) - 1] = 0;  /* strip ending '\n' */
+    buf[m_strlen(buf) - 1] = 0;  /* strip ending '\n' */
     if (!str_ncmp (buf, "#: ", 3) &&
         !str_casecmp (buf + 3, news->conn->account.host))
       break;
@@ -224,14 +222,12 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
       break;
     sscanf (cp + 1, "%s %d %d", file, &l, &m);
     if (!str_cmp (buf, "ALL")) {
-      news->cache = str_dup (file);
+      news->cache = m_strdup(file);
       news->newgroups_time = m;
     }
     else if (news->newsgroups) {
       if ((data = (NNTP_DATA *) hash_find (news->newsgroups, buf)) == NULL) {
-        data =
-          (NNTP_DATA *) mem_calloc (1,
-                                     sizeof (NNTP_DATA) + str_len (buf) + 1);
+        data = xmalloc(sizeof(NNTP_DATA) + m_strlen(buf) + 1);
         data->group = (char *) data + sizeof (NNTP_DATA);
         strcpy (data->group, buf);
         data->nserv = news;
@@ -242,7 +238,7 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
         hash_insert (news->newsgroups, data->group, data, 0);
         nntp_add_to_list (news, data);
       }
-      data->cache = str_dup (file);
+      data->cache = m_strdup(file);
       t = 0;
       if (!data->firstMessage || data->lastMessage < m)
         t = 1;
@@ -291,7 +287,7 @@ int nntp_parse_url (const char *server, ACCOUNT * acct,
   acct->port = NNTP_PORT;
   acct->type = M_ACCT_TYPE_NNTP;
 
-  c = str_dup (server);
+  c = m_strdup(server);
   url_parse_ciss (&url, c);
 
   if (url.scheme == U_NNTP || url.scheme == U_NNTPS) {
@@ -315,7 +311,7 @@ void nntp_expand_path (char *line, size_t len, ACCOUNT * acct)
 {
   ciss_url_t url;
 
-  url.path = str_dup (line);
+  url.path = m_strdup(line);
   mutt_account_tourl (acct, &url);
   url_ciss_tostring (&url, line, len, 0);
   p_delete(&url.path);
@@ -340,7 +336,7 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   NNTP_SERVER *serv;
   CONNECTION *conn;
 
-  memset (&acct, 0, sizeof (ACCOUNT));
+  p_clear(&acct, 1);
 
   if (!server || !*server) {
     mutt_error _("No newsserver defined!");
@@ -348,7 +344,7 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
     return NULL;
   }
 
-  buf = p = mem_calloc (str_len (server) + 10, sizeof (char));
+  buf = p = p_new(char, m_strlen(server) + 10);
   if (url_check_scheme (server) == U_UNKNOWN) {
     strcpy (buf, "nntp://");
     p = strchr (buf, '\0');
@@ -398,9 +394,9 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   }
 
   /* New newsserver */
-  serv = mem_calloc (1, sizeof (NNTP_SERVER));
+  serv = p_new(NNTP_SERVER, 1);
   serv->conn = conn;
-  serv->newsrc = str_dup (file);
+  serv->newsrc = m_strdup(file);
   serv->newsgroups = hash_create (1009);
   slurp_newsrc (serv);          /* load .newsrc */
   nntp_parse_cacheindex (serv); /* load .index */
@@ -513,12 +509,12 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
     len += *buflen;
     *buflen *= 2;
     line = *buf;
-    mem_realloc (buf, *buflen);
+    p_realloc(buf, *buflen);
     line = *buf + (*pline - line);
   }
   strcpy (line, data->group);
-  len -= str_len (line) + 1;
-  line += str_len (line);
+  len -= m_strlen(line) + 1;
+  line += m_strlen(line);
   *line++ = data->subscribed ? ':' : '!';
   *line++ = ' ';
   *line = '\0';
@@ -529,7 +525,7 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
       *buflen *= 2;
       *pline = line;
       line = *buf;
-      mem_realloc (buf, *buflen);
+      p_realloc(buf, *buflen);
       line = *buf + (*pline - line);
     }
     if (x) {
@@ -577,7 +573,7 @@ void newsrc_gen_entries (CONTEXT * ctx)
   }
 
   if (!data->max) {
-    data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+    data->entries = p_new(NEWSRC_ENTRY, 5);
     data->max = 5;
   }
 
@@ -599,7 +595,7 @@ void newsrc_gen_entries (CONTEXT * ctx)
           !ctx->hdrs[x]->read) {
         if (data->num >= data->max) {
           data->max = data->max * 2;
-          mem_realloc (&data->entries, data->max * sizeof (NEWSRC_ENTRY));
+          p_realloc(&data->entries, data->max);
         }
         data->entries[data->num].first = first;
         data->entries[data->num].last = last - 1;
@@ -619,7 +615,7 @@ void newsrc_gen_entries (CONTEXT * ctx)
   if (series && first <= data->lastLoaded) {
     if (data->num >= data->max) {
       data->max = data->max * 2;
-      mem_realloc (&data->entries, data->max * sizeof (NEWSRC_ENTRY));
+      p_realloc(&data->entries, data->max);
     }
     data->entries[data->num].first = first;
     data->entries[data->num].last = data->lastLoaded;
@@ -756,7 +752,7 @@ int mutt_newsrc_update (NNTP_SERVER * news)
   if (!news)
     return -1;
   llen = len = 10 * LONG_STRING;
-  line = buf = mem_calloc (1, len);
+  line = buf = p_new(char, len);
   /* we will generate full newsrc here */
   for (tmp = news->list; tmp; tmp = tmp->next) {
     data = (NNTP_DATA *) tmp->data;
@@ -764,7 +760,7 @@ int mutt_newsrc_update (NNTP_SERVER * news)
       continue;
     nntp_create_newsrc_line (data, &buf, &line, &llen);
     debug_print (2, ("Added to newsrc: %s\n", line));
-    line += str_len (line);
+    line += m_strlen(line);
   }
   /* newrc being fully rewritten */
   if (news->newsrc &&
@@ -790,7 +786,7 @@ static FILE *mutt_mkname (char *s)
     return fp;
 
   nntp_cache_expand (buf, "cache-XXXXXX");
-  pc = buf + str_len (buf) - 12; /* positioning to "cache-XXXXXX" */
+  pc = buf + m_strlen(buf) - 12; /* positioning to "cache-XXXXXX" */
   if ((fd = mkstemp (buf)) == -1)
     return NULL;
   strcpy (s, pc);               /* generated name */
@@ -860,7 +856,7 @@ int nntp_save_cache_index (NNTP_SERVER * news)
   else {
     strfcpy (buf, news->conn->account.host, sizeof (buf));
     f = mutt_mkname (buf);
-    news->cache = str_dup (buf);
+    news->cache = m_strdup(buf);
     nntp_cache_expand (file, buf);
   }
   if (!f)
@@ -916,7 +912,7 @@ int nntp_save_cache_group (CONTEXT * ctx)
               ((NNTP_DATA *) ctx->data)->nserv->conn->account.host,
               ((NNTP_DATA *) ctx->data)->group);
     f = mutt_mkname (buf);
-    ((NNTP_DATA *) ctx->data)->cache = str_dup (buf);
+    ((NNTP_DATA *) ctx->data)->cache = m_strdup(buf);
     nntp_cache_expand (file, buf);
   }
   if (!f)
@@ -996,8 +992,7 @@ NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
   if (!news || !news->newsgroups || !group || !*group)
     return NULL;
   if (!(data = (NNTP_DATA *) hash_find (news->newsgroups, group))) {
-    data =
-      (NNTP_DATA *) mem_calloc (1, sizeof (NNTP_DATA) + str_len (group) + 1);
+    data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
     data->group = (char *) data + sizeof (NNTP_DATA);
     strcpy (data->group, group);
     data->nserv = news;
@@ -1038,7 +1033,7 @@ NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER * news, char *group)
       !(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
     return NULL;
   if (!data->max) {
-    data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+    data->entries = p_new(NEWSRC_ENTRY, 5);
     data->max = 5;
   }
   data->num = 1;
@@ -1062,7 +1057,7 @@ NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
       !(data = (NNTP_DATA *) hash_find (news->newsgroups, group)))
     return NULL;
   if (!data->max) {
-    data->entries = mem_calloc (5, sizeof (NEWSRC_ENTRY));
+    data->entries = p_new(NEWSRC_ENTRY, 5);
     data->max = 5;
   }
   data->num = 1;