X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.c;h=2b9ead7da3a05f1840fa40c333ebd02d196dac02;hp=967431691387b1eb427385483532a0c115a2e5f4;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 9674316..2b9ead7 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.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"
@@ -29,9 +31,6 @@
 
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
 
 #include <unistd.h>
@@ -370,7 +369,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
       pos += chunk;
 
       if (chunk >= sizeof (buf)) {
-        lenbuf += str_len (p);
+        lenbuf += m_strlen(p);
       }
       else {
         if (bar) {
@@ -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);
@@ -515,7 +514,7 @@ static int parse_description (char *line, void *n)
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
       str_cmp (d, data->desc)) {
     p_delete(&data->desc);
-    data->desc = str_dup (d);
+    data->desc = m_strdup(d);
   }
   return 0;
 #undef news
@@ -556,10 +555,10 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
   int x, done = 0;
 
   hdr->env = mutt_new_envelope ();
-  hdr->env->newsgroups = str_dup (nntp_data->group);
+  hdr->env->newsgroups = m_strdup(nntp_data->group);
   hdr->content = mutt_new_body ();
   hdr->content->type = TYPETEXT;
-  hdr->content->subtype = str_dup ("plain");
+  hdr->content->subtype = m_strdup("plain");
   hdr->content->encoding = ENC7BIT;
   hdr->content->disposition = DISPINLINE;
   hdr->content->length = -1;
@@ -580,7 +579,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       nntp_get_status (ctx, hdr, NULL, hdr->article_num);
       break;
     case 1:
-      hdr->env->subject = str_dup (b);
+      hdr->env->subject = m_strdup(b);
       break;
     case 2:
       rfc822_free_address (&hdr->env->from);
@@ -592,7 +591,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
        * bothered me for _years_ */
       if (!hdr->env->from) {
         hdr->env->from = rfc822_new_address ();
-        hdr->env->from->personal = str_dup (b);
+        hdr->env->from->personal = m_strdup(b);
       }
       break;
     case 3:
@@ -601,7 +600,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       break;
     case 4:
       p_delete(&hdr->env->message_id);
-      hdr->env->message_id = str_dup (b);
+      hdr->env->message_id = m_strdup(b);
       break;
     case 5:
       mutt_free_list (&hdr->env->references);
@@ -617,7 +616,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       if (!hdr->read)
         p_delete(&hdr->env->xref);
       b = b + 6;                /* skips the "Xref: " */
-      hdr->env->xref = str_dup (b);
+      hdr->env->xref = m_strdup(b);
       nntp_parse_xref (ctx, nntp_data->group, b, hdr);
     }
     rfc2047_decode_envelope (hdr->env);
@@ -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 = xmalloc(sizeof(NNTP_DATA) + str_len(buf) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(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);
@@ -957,7 +956,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   cache->index = ctx->hdrs[msgno]->index;
   mutt_mktemp (path);
-  cache->path = str_dup (path);
+  cache->path = m_strdup(path);
   if (!(msg->fp = safe_fopen (path, "w+"))) {
     p_delete(&cache->path);
     return -1;
@@ -1053,7 +1052,7 @@ int nntp_post (const char *msg)
   buf[0] = '.';
   buf[1] = '\0';
   while (fgets (buf + 1, sizeof (buf) - 2, f) != NULL) {
-    len = str_len (buf);
+    len = m_strlen(buf);
     if (buf[len - 1] == '\n') {
       buf[len - 1] = '\r';
       buf[len] = '\n';
@@ -1067,7 +1066,7 @@ int nntp_post (const char *msg)
   }
   fclose (f);
 
-  if (buf[str_len (buf) - 1] != '\n')
+  if (buf[m_strlen(buf) - 1] != '\n')
     mutt_socket_write_d (nntp_data->nserv->conn, "\r\n", M_SOCK_LOG_HDR);
   mutt_socket_write_d (nntp_data->nserv->conn, ".\r\n", M_SOCK_LOG_HDR);
   if (mutt_socket_readln (buf, sizeof (buf), nntp_data->nserv->conn) < 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 = xmalloc(sizeof(NNTP_DATA) + str_len(group) + 1);
+    nntp_data = xmalloc(sizeof(NNTP_DATA) + m_strlen(group) + 1);
     nntp_data->group = (char *) nntp_data + sizeof (NNTP_DATA);
     strcpy (nntp_data->group, group);
     nntp_data->nserv = s;
@@ -1296,7 +1295,7 @@ static int add_group (char *buf, void *serv)
   if (nntp_data->desc)
     p_delete(&nntp_data->desc);
   if (*desc)
-    nntp_data->desc = str_dup (desc);
+    nntp_data->desc = m_strdup(desc);
   if (nntp_data->rc || nntp_data->lastCached)
     mutt_newsgroup_stat (nntp_data);
   else if (nntp_data->lastMessage &&
@@ -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;