From ac922fbc89f9988ac13dd90fbe5fe4fbb96fda37 Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sat, 1 Dec 2018 16:12:03 +0000
Subject: [PATCH] nntp: tidy headers

---
 nntp/newsrc.c       |  2 +-
 nntp/nntp.c         |  4 ++--
 nntp/nntp.h         | 17 ++++++-----------
 nntp/nntp_private.h |  7 ++++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/nntp/newsrc.c b/nntp/newsrc.c
index d37a82787..593338e91 100644
--- a/nntp/newsrc.c
+++ b/nntp/newsrc.c
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
@@ -53,7 +54,6 @@
 #include "mutt_socket.h"
 #include "mutt_window.h"
 #include "muttlib.h"
-#include "mx.h"
 #include "nntp.h"
 #include "protos.h"
 #include "sort.h"
diff --git a/nntp/nntp.c b/nntp/nntp.c
index f34299bd7..0a0969a5b 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 #include "nntp_private.h"
 #include "mutt/mutt.h"
+#include "config/lib.h"
 #include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
@@ -1227,8 +1228,7 @@ static int parse_overview_line(char *line, void *data)
  * @retval  0 Success
  * @retval -1 Failure
  */
-static int nntp_fetch_headers(struct Mailbox *m, void *hc, anum_t first,
-                              anum_t last, bool restore)
+static int nntp_fetch_headers(struct Mailbox *m, void *hc, anum_t first, anum_t last, bool restore)
 {
   if (!m)
     return -1;
diff --git a/nntp/nntp.h b/nntp/nntp.h
index ca5d9b2a7..d1c443d3c 100644
--- a/nntp/nntp.h
+++ b/nntp/nntp.h
@@ -45,8 +45,9 @@
 #include "mx.h"
 
 struct ConnAccount;
-struct Email;
 struct Context;
+struct Mailbox;
+struct stat;
 
 /* These Config Variables are only used in nntp/nntp.c */
 extern char *NntpAuthenticators;
@@ -60,6 +61,9 @@ extern bool  ShowNewNews;
 extern char *NewsCacheDir;
 extern char *Newsrc;
 
+extern struct NntpAccountData *CurrentNewsSrv;
+extern struct MxOps mx_nntp_ops;
+
 /* article number type and format */
 #define anum_t uint32_t
 #define ANUM "%u"
@@ -165,18 +169,9 @@ void nntp_newsrc_close(struct NntpAccountData *adata);
 void nntp_mailbox(struct Mailbox *m, char *buf, size_t buflen);
 void nntp_expand_path(char *buf, size_t buflen, struct ConnAccount *acct);
 void nntp_clear_cache(struct NntpAccountData *adata);
-const char *nntp_format_str(char *buf, size_t buflen, size_t col, int cols, char op,
-                            const char *src, const char *prec, const char *if_str,
-                            const char *else_str, unsigned long data, enum FormatFlag flags);
-
-void nntp_article_status(struct Mailbox *m, struct Email *e, char *group, anum_t anum);
-
-extern struct NntpAccountData *CurrentNewsSrv;
-
+const char *nntp_format_str(char *buf, size_t buflen, size_t col, int cols, char op, const char *src, const char *prec, const char *if_str, const char *else_str, unsigned long data, enum FormatFlag flags);
 int nntp_compare_order(const void *a, const void *b);
 int nntp_path_probe(const char *path, const struct stat *st);
 const char *group_index_format_str(char *buf, size_t buflen, size_t col, int cols, char op, const char *src, const char *prec, const char *if_str, const char *else_str, unsigned long data, enum FormatFlag flags);
 
-extern struct MxOps mx_nntp_ops;
-
 #endif /* MUTT_NNTP_NNTP_H */
diff --git a/nntp/nntp_private.h b/nntp/nntp_private.h
index 9ea94c00c..d00788494 100644
--- a/nntp/nntp_private.h
+++ b/nntp/nntp_private.h
@@ -23,6 +23,9 @@
 #ifndef MUTT_NNTP_NNTP_PRIVATE_H
 #define MUTT_NNTP_NNTP_PRIVATE_H
 
+#include <inttypes.h>
+#include <stdint.h>
+#include "nntp.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif
@@ -31,8 +34,6 @@ struct Connection;
 struct Context;
 struct Email;
 struct Mailbox;
-struct NntpAccountData;
-struct NntpMboxData;
 
 #define NNTP_PORT 119
 #define NNTP_SSL_PORT 563
@@ -53,7 +54,6 @@ struct NntpAccountData *nntp_adata_new(struct Connection *conn);
 int  nntp_add_group(char *line, void *data);
 void nntp_bcache_update(struct NntpMboxData *mdata);
 int  nntp_check_new_groups(struct Mailbox *m, struct NntpAccountData *adata);
-void nntp_data_free(void *data);
 void nntp_delete_group_cache(struct NntpMboxData *mdata);
 struct NntpEmailData *nntp_edata_get(struct Email *e);
 void nntp_group_unread_stat(struct NntpMboxData *mdata);
@@ -61,6 +61,7 @@ void nntp_hash_destructor_t(int type, void *obj, intptr_t data);
 void nntp_mdata_free(void **ptr);
 void nntp_newsrc_gen_entries(struct Context *ctx);
 int  nntp_open_connection(struct NntpAccountData *adata);
+void nntp_article_status(struct Mailbox *m, struct Email *e, char *group, anum_t anum);
 
 #ifdef USE_HCACHE
 header_cache_t *nntp_hcache_open(struct NntpMboxData *mdata);
-- 
2.40.0