X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnewsrc.c;h=1a50b0da72f27b890c0c12448c409bda42145743;hp=6d5fad5c172af70015d7fddf58d24ac18556db88;hb=5d0104e059e3bd33be6acc3c00b3f3944a3897f6;hpb=b23d5033080fe9f9fba038e3cf1e3ec2b0a0d33d diff --git a/nntp/newsrc.c b/nntp/newsrc.c index 6d5fad5..1a50b0d 100644 --- a/nntp/newsrc.c +++ b/nntp/newsrc.c @@ -64,9 +64,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 @@ -215,9 +214,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); @@ -380,13 +378,13 @@ NNTP_SERVER *mutt_select_newsserver (char *server) serv = p_new(NNTP_SERVER, 1); 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); @@ -963,9 +961,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) {