fixes and simplifications

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/nntp.c b/nntp.c
index 4d81012..4fc321e 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -150,15 +150,12 @@ static int nntp_parse_cacheindex(nntp_server_t *news)
   nntp_data_t *data;
   int l, m, t;
 
-  /* check is server name defined or not */
-  if (!news || !news->conn || !news->conn->account.host)
-    return -1;
   unset_option (OPTNEWSCACHE);
   if (m_strisempty(NewsCacheDir))
     return 0;
 
   m_strcpy(dir, sizeof(dir), NewsCacheDir);
-  mutt_expand_path (dir, sizeof (dir));
+  mutt_expand_path(dir, sizeof(dir));
 
   if (lstat (dir, &st) || (st.st_mode & S_IFDIR) == 0) {
     snprintf(buf, sizeof(buf), _("Directory %s not exist. Create it?"), dir);
@@ -1526,9 +1523,7 @@ static void nntp_get_desc (nntp_data_t * data, const char *mask, char *msg, prog
     snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
   else
     snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
-  if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
-      0) {
-  }
+  mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0);
 }
 
 /*