X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnewsrc.c;h=c919d86f54a654439f02fcf3372c540a49ce7ec3;hb=1f34780e2ee55984ebd4265bd7b308c6aeee348f;hp=349e3e763cdf33b3b665b6ac45c6022dd1cb6326;hpb=8d429041536e4508e8dd00b390721895dc324b9b;p=apps%2Fmadmutt.git

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index 349e3e7..c919d86 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -21,20 +21,11 @@
 #include "sort.h"
 #include "nntp.h"
 
-void nntp_add_to_list (NNTP_SERVER * s, NNTP_DATA * d)
+void nntp_add_to_list(NNTP_SERVER *s, NNTP_DATA *d)
 {
-  string_list_t *l;
-
-  if (!s || !d)
-    return;
-
-  l = p_new(string_list_t, 1);
-  if (s->list)
-    s->tail->next = l;
-  else
-    s->list = l;
-  s->tail = l;
-  l->data = (void *) d;
+    *s->tail = p_new(string_list_t, 1);
+    (*s->tail)->data = (void *)d;
+    s->tail = &(*s->tail)->next;
 }
 
 static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
@@ -64,9 +55,8 @@ static int nntp_parse_newsrc_line (NNTP_SERVER * news, char *line)
     data->nserv = news;
     data->deleted = 1;
     if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
-      news->newsgroups =
         hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
-    hash_insert (news->newsgroups, data->group, data, 0);
+    hash_insert (news->newsgroups, data->group, data);
     nntp_add_to_list (news, data);
   }
   else
@@ -162,7 +152,7 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   if (!news || !news->conn || !news->conn->account.host)
     return -1;
   unset_option (OPTNEWSCACHE);
-  if (!NewsCacheDir || !*NewsCacheDir)
+  if (m_strisempty(NewsCacheDir))
     return 0;
 
   m_strcpy(dir, sizeof(dir), NewsCacheDir);
@@ -215,9 +205,8 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
         data->nserv = news;
         data->deleted = 1;
         if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
-          news->newsgroups =
             hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
-        hash_insert (news->newsgroups, data->group, data, 0);
+        hash_insert (news->newsgroups, data->group, data);
         nntp_add_to_list (news, data);
       }
       data->cache = m_strdup(file);
@@ -237,12 +226,14 @@ static int nntp_parse_cacheindex (NNTP_SERVER * news)
   return 0;
 }
 
-const char *nntp_format_str (char *dest, ssize_t destlen, char op,
-                             const char *src, const char *fmt,
-                             const char *ifstring, const char *elsestring,
-                             unsigned long data, format_flag flags)
+const char *nntp_format_str(char *dest, ssize_t destlen, char op,
+                            const char *src, const char *fmt,
+                            const char *ifstr __attribute__((unused)),
+                            const char *elstr __attribute__((unused)),
+                            anytype data __attribute__((unused)),
+                            format_flag flags __attribute__((unused)))
 {
-  char fn[SHORT_STRING], tmp[SHORT_STRING];
+  char fn[STRING], tmp[STRING];
 
   switch (op) {
   case 's':
@@ -274,7 +265,7 @@ int nntp_parse_url (const char *server, ACCOUNT * act,
 
   if (url.scheme == U_NNTP || url.scheme == U_NNTPS) {
     if (url.scheme == U_NNTPS) {
-      act->flags |= M_ACCT_SSL;
+      act->has_ssl = 1;
       act->port = NNTP_SSL_PORT;
     }
 
@@ -344,9 +335,8 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
   if (!conn)
     return NULL;
 
-  mutt_FormatString (file, sizeof (file), NONULL (NewsRc), nntp_format_str, 0,
-                     0);
-  mutt_expand_path (file, sizeof (file));
+  m_strformat(file, sizeof(file), 0, NewsRc, nntp_format_str, NULL, 0);
+  mutt_expand_path(file, sizeof(file));
 
   serv = (NNTP_SERVER *) conn->data;
   if (serv) {
@@ -377,15 +367,16 @@ NNTP_SERVER *mutt_select_newsserver (char *server)
 
   /* New newsserver */
   serv = p_new(NNTP_SERVER, 1);
+  serv->tail = &serv->list;
   serv->conn = conn;
   serv->newsrc = m_strdup(file);
-  serv->newsgroups = hash_create (1009);
+  serv->newsgroups = hash_new(1009, false);
   slurp_newsrc (serv);          /* load .newsrc */
   nntp_parse_cacheindex (serv); /* load .index */
   if (option (OPTNEWSCACHE) && serv->cache && nntp_get_cache_all (serv) >= 0)
     nntp_check_newgroups (serv, 1);
   else if (nntp_get_active (serv) < 0) {
-    hash_destroy (&serv->newsgroups, nntp_delete_data);
+    hash_delete (&serv->newsgroups, nntp_delete_data);
     for (list = serv->list; list; list = list->next)
       list->data = NULL;
     string_list_wipe(&serv->list);
@@ -442,8 +433,7 @@ void nntp_get_status (CONTEXT * ctx, HEADER * h, char *group, int article)
 
 void mutt_newsgroup_stat (NNTP_DATA * data)
 {
-  int i;
-  unsigned int first, last;
+  int i, first, last;
 
   data->unread = 0;
   if (data->lastMessage == 0 || data->firstMessage > data->lastMessage)
@@ -511,15 +501,6 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
       len--;
     }
 
-#if 0
-    if (data->entries[x].first == data->entries[x].last)
-      snprintf (line, len, "%d%n", data->entries[x].first, &i);
-    else
-      snprintf (line, len, "%d-%d%n",
-                data->entries[x].first, data->entries[x].last, &i);
-    len -= i;
-    line += i;
-#else
     i = puti (line, data->entries[x].first);
     line += i;
     len -= i;
@@ -530,7 +511,6 @@ static void nntp_create_newsrc_line (NNTP_DATA * data, char **buf,
       line += i;
       len -= i;
     }
-#endif
   }
   *line++ = '\n';
   *line = '\0';
@@ -541,7 +521,7 @@ void newsrc_gen_entries (CONTEXT * ctx)
 {
   NNTP_DATA *data = (NNTP_DATA *) ctx->data;
   int series, x;
-  unsigned int last = 0, first = 1;
+  int last = 0, first = 1;
   int save_sort = SORT_ORDER;
 
   if (Sort != SORT_ORDER) {
@@ -906,7 +886,7 @@ int nntp_save_cache_group (CONTEXT * ctx)
     if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->article_num != prev) {
       h = ctx->hdrs[i];
       addr[0] = 0;
-      rfc822_write_address (addr, sizeof (addr), h->env->from, 0);
+      rfc822_addrcat(addr, sizeof(addr), h->env->from, 0);
       tm = gmtime (&h->date_sent);
       snprintf (buf, sizeof (buf),
                 "%d\t%s\t%s\t%d %s %d %02d:%02d:%02d GMT\t%s\t",
@@ -972,9 +952,8 @@ NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER * news, char *group)
     data->nserv = news;
     data->deleted = 1;
     if (news->newsgroups->nelem < news->newsgroups->curnelem * 2)
-      news->newsgroups =
         hash_resize (news->newsgroups, news->newsgroups->nelem * 2);
-    hash_insert (news->newsgroups, data->group, data, 0);
+    hash_insert (news->newsgroups, data->group, data);
     nntp_add_to_list (news, data);
   }
   if (!data->subscribed) {
@@ -1078,7 +1057,7 @@ void nntp_buffy (char* dst, ssize_t dstlen) {
       if (data && data->subscribed && data->unread) {
         if (Context && Context->magic == M_NNTP &&
             !m_strcmp(data->group, ((NNTP_DATA *) Context->data)->group)) {
-          unsigned int i, unread = 0;
+          int i, unread = 0;
 
           for (i = 0; i < Context->msgcount; i++)
             if (!Context->hdrs[i]->read && !Context->hdrs[i]->deleted)