more hash code simplifications.

[apps/madmutt.git] / nntp / nntp.h

diff --git a/nntp/nntp.h b/nntp/nntp.h
index f8a389f..de7627f 100644 (file)
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -12,10 +12,10 @@
 #ifndef _NNTP_H_
 #define _NNTP_H_ 1
 
-#include "mutt_socket.h"
-#include "mailbox.h"
+#include <lib-sys/mutt_socket.h>
+#include <lib-mx/mx.h>
 
-#include <time.h>
+extern mx_t const nntp_mx;
 
 #define NNTP_PORT 119
 #define NNTP_SSL_PORT 563
@@ -47,9 +47,9 @@ typedef struct {
   time_t mtime;
   time_t newgroups_time;
   time_t check_time;
-  HASH *newsgroups;
-  LIST *list;                   /* list of newsgroups */
-  LIST *tail;                   /* last entry of list */
+  hash_t *newsgroups;
+  string_list_t *list;                   /* list of newsgroups */
+  string_list_t *tail;                   /* last entry of list */
   CONNECTION *conn;
 } NNTP_SERVER;
 
@@ -85,7 +85,7 @@ int nntp_get_cache_all (NNTP_SERVER *);
 int nntp_save_cache_index (NNTP_SERVER *);
 int nntp_check_newgroups (NNTP_SERVER *, int);
 int nntp_save_cache_group (CONTEXT *);
-int nntp_parse_url (const char *, ACCOUNT *, char *, size_t);
+int nntp_parse_url (const char *, ACCOUNT *, char *, ssize_t);
 void newsrc_gen_entries (CONTEXT *);
 void nntp_get_status (CONTEXT *, HEADER *, char *, int);
 void mutt_newsgroup_stat (NNTP_DATA *);
@@ -102,22 +102,18 @@ NNTP_DATA *mutt_newsgroup_catchup (NNTP_SERVER *, char *);
 NNTP_DATA *mutt_newsgroup_uncatchup (NNTP_SERVER *, char *);
 void nntp_clear_cacheindex (NNTP_SERVER *);
 int mutt_newsrc_update (NNTP_SERVER *);
-int nntp_open_mailbox (CONTEXT *);
-int nntp_sync_mailbox (CONTEXT *);
-int nntp_check_mailbox (CONTEXT *);
 int nntp_close_mailbox (CONTEXT *);
-void nntp_fastclose_mailbox (CONTEXT *);
 int nntp_fetch_message (MESSAGE *, CONTEXT *, int);
 int nntp_post (const char *);
 int nntp_check_msgid (CONTEXT *, const char *);
 int nntp_check_children (CONTEXT *, const char *);
-void nntp_buffy (char *);
-void nntp_expand_path (char *, size_t, ACCOUNT *);
-void nntp_logout_all ();
-const char *nntp_format_str (char *, size_t, char, const char *, const char *,
-                             const char *, const char *, unsigned long,
-                             format_flag);
+void nntp_buffy (char* dst, ssize_t dstlen);
+void nntp_expand_path (char *, ssize_t, ACCOUNT *);
+void nntp_logout_all(void);
+const char *nntp_format_str(char *, ssize_t, char, const char *, const char *,
+                            const char *, const char *, anytype, format_flag);
+void nntp_sync_sidebar (NNTP_DATA*);
 
-NNTP_SERVER *CurrentNewsSrv INITVAL (NULL);
+WHERE NNTP_SERVER *CurrentNewsSrv INITVAL (NULL);
 
 #endif /* _NNTP_H_ */