X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=8359cac8a0cad0d5354a98ac653f930ae4a9fd51;hp=4aa3409613e2522bcd9be990b5695b8bc0f9be79;hb=617e7d83d14e14e6a520a48e75437211b16c8834;hpb=9218fd9d7e2a7976b34683c60cb94f7fda42141a

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 4aa3409..8359cac 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "ascii.h"
 #include "mx.h"
@@ -20,7 +22,6 @@
 # include "mutt_ssl.h"
 #endif
 
-#include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/debug.h"
 #include "lib/str.h"
@@ -54,7 +55,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  mem_free (&c);
+  p_delete(&c);
   return ret;
 }
 
@@ -85,7 +86,7 @@ static int fetch_capa (char *line, void *data)
   char *c;
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
-    mem_free (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
     c = line + 4;
     SKIPWS (c);
     pop_data->auth_list = str_dup (c);
@@ -112,12 +113,10 @@ static int fetch_auth (char *line, void *data)
   POP_DATA *pop_data = (POP_DATA *) data;
 
   if (!pop_data->auth_list) {
-    pop_data->auth_list = mem_malloc (strlen (line) + 1);
-    *pop_data->auth_list = '\0';
-  }
-  else {
-    mem_realloc (&pop_data->auth_list,
-                  strlen (pop_data->auth_list) + strlen (line) + 2);
+    pop_data->auth_list = p_new(char, strlen(line) + 1);
+  } else {
+    p_realloc(&pop_data->auth_list,
+              strlen(pop_data->auth_list) + strlen(line) + 2);
     strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
   }
   strcat (pop_data->auth_list, line);   /* __STRCAT_CHECKED__ */
@@ -149,7 +148,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->resp_codes = 0;
     pop_data->expire = 1;
     pop_data->login_delay = 0;
-    mem_free (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
   }
 
   /* Execute CAPA command */
@@ -444,7 +443,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
   if (ret != PQ_OK)
     return ret;
 
-  inbuf = mem_malloc (sizeof (buf));
+  inbuf = p_new(char, sizeof(buf));
 
   FOREVER {
     chunk =
@@ -463,7 +462,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
       p++;
     }
 
-    strfcpy (inbuf + lenbuf, p, sizeof (buf));
+    strfcpy(inbuf + lenbuf, p, sizeof(buf));
     pos += chunk;
 
     if (chunk >= sizeof (buf)) {
@@ -477,10 +476,10 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
       lenbuf = 0;
     }
 
-    mem_realloc (&inbuf, lenbuf + sizeof (buf));
+    p_realloc(&inbuf, lenbuf + sizeof(buf));
   }
 
-  mem_free (&inbuf);
+  p_delete(&inbuf);
   return ret;
 }