X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=nntp%2Fnntp.h;h=0fe2605e6f1199f763fadd44e4fa2316de9c73b7;hp=9baaed72af55e06fb3d48e0b5afed2199ec59fbc;hb=4e846802eb1912873b56a27644215e6eeb91dc76;hpb=124aee0f600ef550fd1c73e8d7a60556f4f6afd0

diff --git a/nntp/nntp.h b/nntp/nntp.h
index 9baaed7..0fe2605 100644
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -35,11 +35,12 @@ typedef struct {
 } 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;
@@ -47,31 +48,31 @@ typedef struct {
   time_t mtime;
   time_t newgroups_time;
   time_t check_time;
-  HASH *newsgroups;
+  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 {
   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;
@@ -110,9 +111,8 @@ int nntp_check_children (CONTEXT *, const char *);
 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 *, unsigned long,
-                             format_flag);
+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*);
 
 WHERE NNTP_SERVER *CurrentNewsSrv INITVAL (NULL);