projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make taht shorter
[apps/madmutt.git]
/
nntp
/
newsrc.c
diff --git
a/nntp/newsrc.c
b/nntp/newsrc.c
index
94929bd
..
29b427c
100644
(file)
--- a/
nntp/newsrc.c
+++ b/
nntp/newsrc.c
@@
-13,37
+13,37
@@
#include <config.h>
#endif
#include <config.h>
#endif
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <libgen.h>
+#include <sys/stat.h>
+
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
#include <lib-mime/mime.h>
#include <lib-mime/mime.h>
+#include <lib-ui/curses.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "mutt_curses.h"
#include "sort.h"
#include "mx.h"
#include "nntp.h"
#include "rfc1524.h"
#include "sort.h"
#include "mx.h"
#include "nntp.h"
#include "rfc1524.h"
-#include "lib/debug.h"
-
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <libgen.h>
-#include <sys/stat.h>
-
void nntp_add_to_list (NNTP_SERVER * s, NNTP_DATA * d)
{
void nntp_add_to_list (NNTP_SERVER * s, NNTP_DATA * d)
{
-
LIST
*l;
+
string_list_t
*l;
if (!s || !d)
return;
if (!s || !d)
return;
- l = p_new(
LIST
, 1);
+ l = p_new(
string_list_t
, 1);
if (s->list)
s->tail->next = l;
else
if (s->list)
s->tail->next = l;
else
@@
-265,7
+265,7
@@
const char *nntp_format_str (char *dest, size_t destlen, char op,
switch (op) {
case 's':
m_strcpy(fn, sizeof (fn), NewsServer);
switch (op) {
case 's':
m_strcpy(fn, sizeof (fn), NewsServer);
-
str_tolower
(fn);
+
m_strtolower
(fn);
snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
snprintf (dest, destlen, tmp, fn);
break;
snprintf (tmp, sizeof (tmp), "%%%ss", fmt);
snprintf (dest, destlen, tmp, fn);
break;
@@
-331,7
+331,7
@@
NNTP_SERVER *mutt_select_newsserver (char *server)
{
char file[_POSIX_PATH_MAX];
char *buf, *p;
{
char file[_POSIX_PATH_MAX];
char *buf, *p;
-
LIST
*list;
+
string_list_t
*list;
ACCOUNT acct;
NNTP_SERVER *serv;
CONNECTION *conn;
ACCOUNT acct;
NNTP_SERVER *serv;
CONNECTION *conn;
@@
-406,7
+406,7
@@
NNTP_SERVER *mutt_select_newsserver (char *server)
hash_destroy (&serv->newsgroups, nntp_delete_data);
for (list = serv->list; list; list = list->next)
list->data = NULL;
hash_destroy (&serv->newsgroups, nntp_delete_data);
for (list = serv->list; list; list = list->next)
list->data = NULL;
-
mutt_free_list
(&serv->list);
+
string_list_wipe
(&serv->list);
p_delete(&serv->newsrc);
p_delete(&serv->cache);
p_delete(&serv);
p_delete(&serv->newsrc);
p_delete(&serv->cache);
p_delete(&serv);
@@
-745,7
+745,7
@@
int mutt_newsrc_update (NNTP_SERVER * news)
{
char *buf, *line;
NNTP_DATA *data;
{
char *buf, *line;
NNTP_DATA *data;
-
LIST
*tmp;
+
string_list_t
*tmp;
int r = -1;
size_t len, llen;
int r = -1;
size_t len, llen;
@@
-821,7
+821,7
@@
static int nntp_update_cacheindex (NNTP_SERVER * serv, NNTP_DATA * data)
void nntp_clear_cacheindex (NNTP_SERVER * news)
{
NNTP_DATA *data;
void nntp_clear_cacheindex (NNTP_SERVER * news)
{
NNTP_DATA *data;
-
LIST
*tmp;
+
string_list_t
*tmp;
if (option (OPTSAVEUNSUB) || !news)
return;
if (option (OPTSAVEUNSUB) || !news)
return;
@@
-842,7
+842,7
@@
int nntp_save_cache_index (NNTP_SERVER * news)
char file[_POSIX_PATH_MAX];
NNTP_DATA *d;
FILE *f;
char file[_POSIX_PATH_MAX];
NNTP_DATA *d;
FILE *f;
-
LIST
*l;
+
string_list_t
*l;
if (!news || !news->newsgroups)
return -1;
if (!news || !news->newsgroups)
return -1;
@@
-1078,7
+1078,7
@@
NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER * news, char *group)
/* this routine gives the first newsgroup with new messages */
void nntp_buffy (char* dst, size_t dstlen) {
/* this routine gives the first newsgroup with new messages */
void nntp_buffy (char* dst, size_t dstlen) {
-
LIST
*list;
+
string_list_t
*list;
int count = 0;
/* forward to current group */
int count = 0;
/* forward to current group */