simplifications

[apps/madmutt.git] / nntp.h

diff --git a/nntp.h b/nntp.h
index 5fa5250..7acfa9e 100644 (file)
--- a/nntp.h
+++ b/nntp.h
@@ -1,33 +1,21 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1998 Brandon Long <blong@fiction.net>
  * Copyright (C) 1999 Andrej Gritsenko <andrej@lucky.net>
  * Copyright (C) 2000-2002 Vsevolod Volkov <vvv@mutt.org.ua>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #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>
-
-#define NNTP_PORT 119
-#define NNTP_SSL_PORT 563
+extern mx_t const nntp_mx;
 
 /* number of entries in the hash table */
 #define NNTP_CACHE_LEN 10
@@ -39,16 +27,12 @@ enum {
 };
 
 typedef struct {
-  int first;
-  int last;
-} NEWSRC_ENTRY;
-
-typedef struct {
-  unsigned int hasXPAT:1;
-  unsigned int hasXGTITLE:1;
-  unsigned int hasXOVER:1;
-  unsigned int hasLISTGROUP:1;
-  unsigned int status:3;
+  unsigned feat_known   : 1;
+  unsigned hasXPAT      : 1;
+  unsigned hasXGTITLE   : 1;
+  unsigned hasXOVER     : 1;
+  unsigned hasLISTGROUP : 1;
+  unsigned status       : 3;
   char *newsrc;
   char *cache;
   int stat;
@@ -56,31 +40,36 @@ 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;
 
 typedef struct {
-  unsigned int index;
+  int   index;
   char *path;
 } NNTP_CACHE;
 
+typedef struct {
+  int first;
+  int last;
+} NEWSRC_ENTRY;
+
 typedef struct {
   NEWSRC_ENTRY *entries;
-  unsigned int num;             /* number of used entries */
-  unsigned int max;             /* number of allocated entries */
-  unsigned int unread;
-  unsigned int firstMessage;
-  unsigned int lastMessage;
-  unsigned int lastLoaded;
-  unsigned int lastCached;
-  unsigned int subscribed:1;
-  unsigned int rc:1;
-  unsigned int new:1;
-  unsigned int allowed:1;
-  unsigned int deleted:1;
+  int num;             /* number of used entries */
+  int max;             /* number of allocated entries */
+  int unread;
+  int firstMessage;
+  int lastMessage;
+  int lastLoaded;
+  int lastCached;
+  unsigned subscribed:1;
+  unsigned rc:1;
+  unsigned new:1;
+  unsigned allowed:1;
+  unsigned deleted:1;
   char *group;
   char *desc;
   char *cache;
@@ -88,22 +77,6 @@ typedef struct {
   NNTP_CACHE acache[NNTP_CACHE_LEN];
 } NNTP_DATA;
 
-/* internal functions */
-int nntp_get_active (NNTP_SERVER *);
-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);
-void newsrc_gen_entries (CONTEXT *);
-void nntp_get_status (CONTEXT *, HEADER *, char *, int);
-void mutt_newsgroup_stat (NNTP_DATA *);
-void nntp_delete_cache (NNTP_DATA *);
-void nntp_add_to_list (NNTP_SERVER *, NNTP_DATA *);
-void nntp_cache_expand (char *, const char *);
-void nntp_delete_data (void *);
-
-/* exposed interface */
 NNTP_SERVER *mutt_select_newsserver (char *);
 NNTP_DATA *mutt_newsgroup_subscribe (NNTP_SERVER *, char *);
 NNTP_DATA *mutt_newsgroup_unsubscribe (NNTP_SERVER *, char *);
@@ -111,22 +84,19 @@ 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);
+int nntp_get_active (NNTP_SERVER *);
+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_ */