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
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);
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':
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) {
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);
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) {