Use p_new instead of xmalloc()

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

diff --git a/nntp/nntp.c b/nntp/nntp.c
index a2388d9..afe5c9e 100644 (file)
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -233,7 +233,7 @@ static int nntp_open_connection (NNTP_SERVER * serv)
 
 static int nntp_reconnect (NNTP_SERVER * serv)
 {
-  char buf[SHORT_STRING];
+  char buf[STRING];
 
   mutt_socket_close (serv->conn);
 
@@ -448,14 +448,14 @@ static int nntp_read_header (CONTEXT * ctx, const char *msgid,
 
   ret = mutt_nntp_fetch (nntp_data, buf, NULL, NULL, nntp_read_tempfile, f, 0);
   if (ret) {
-    fclose (f);
+    m_fclose(&f);
     unlink (tempfile);
     return (ret == -1 ? -1 : 1);
   }
 
   h->article_num = article_num;
   h->env = mutt_read_rfc822_header (f, h, 0, 0);
-  fclose (f);
+  m_fclose(&f);
   unlink (tempfile);
 
   if (h->env->xref != NULL)
@@ -725,7 +725,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
           mutt_message ("%s %d/%d", msg2, c, r);
         add_xover_line (buf, &fc);
       }
-      fclose (f);
+      m_fclose(&f);
       nntp_data->lastLoaded = fc.last;
       first = fc.last + 1;
       if (ctx->msgcount > oldmsgcount)
@@ -940,7 +940,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   }
 
   if (ret) {
-    fclose (msg->fp);
+    m_fclose(&msg->fp);
     unlink (path);
     p_delete(&cache->path);
     return -1;
@@ -1022,7 +1022,7 @@ int nntp_post (const char *msg)
     else
       mutt_socket_write(nntp_data->nserv->conn, buf + 1);
   }
-  fclose (f);
+  m_fclose(&f);
 
   if (buf[m_strlen(buf) - 1] != '\n')
     mutt_socket_write(nntp_data->nserv->conn, "\r\n");
@@ -1344,7 +1344,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
       i++;
     }
     add_group (NULL, NULL);
-    fclose (f);
+    m_fclose(&f);
     mutt_clear_error ();
     return 0;
   }
@@ -1357,7 +1357,7 @@ int nntp_get_cache_all (NNTP_SERVER * serv)
 /* Load list of all newsgroups from active */
 int nntp_get_active (NNTP_SERVER * serv)
 {
-  char msg[SHORT_STRING];
+  char msg[STRING];
   NNTP_DATA nntp_data;
   string_list_t *tmp;