Rocco Rutte:

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

diff --git a/pop/pop.c b/pop/pop.c
index 3213e92..87912b7 100644 (file)
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -49,7 +49,6 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
   FILE *f;
   int index;
   pop_query_status ret;
-  cmd_status status;
   long length;
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
@@ -125,7 +124,7 @@ static int fetch_uidl (char *line, void *data)
 
   sscanf (line, "%d %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++)
-    if (!safe_strcmp (line, ctx->hdrs[i]->data))
+    if (!str_cmp (line, ctx->hdrs[i]->data))
       break;
 
   if (i == ctx->msgcount) {
@@ -136,7 +135,7 @@ static int fetch_uidl (char *line, void *data)
 
     ctx->msgcount++;
     ctx->hdrs[i] = mutt_new_header ();
-    ctx->hdrs[i]->data = safe_strdup (line);
+    ctx->hdrs[i]->data = str_dup (line);
   }
   else if (ctx->hdrs[i]->index != index - 1)
     pop_data->clear_cache = 1;
@@ -242,7 +241,7 @@ int pop_open_mailbox (CONTEXT * ctx)
     return -1;
 
   FREE (&ctx->path);
-  ctx->path = safe_strdup (buf);
+  ctx->path = str_dup (buf);
 
   pop_data = safe_calloc (1, sizeof (POP_DATA));
   pop_data->conn = conn;
@@ -397,7 +396,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
    * portion of the headers, those required for the main display.
    */
   cache->index = h->index;
-  cache->path = safe_strdup (path);
+  cache->path = str_dup (path);
   rewind (msg->fp);
   uidl = h->data;
   mutt_free_envelope (&h->env);