Moved mhstore declarations from uip/mhn.c, uip/mhstore.c, and

uip/mhstoresbr.c to h/mhparse.h.

diff --git a/h/mhparse.h b/h/mhparse.h
index b9e7b90e65169a85187de07a5a81dff60f85ca3c..06710bdc151adacd829fc9e82b811365473beca7 100644 (file)
--- a/h/mhparse.h
+++ b/h/mhparse.h
@@ -528,3 +528,13 @@ int show_content_aux(CT ct, int alternate, char *cp, char *cracked,
                     struct format *fmt);
 
 extern int checksw;    /* Add Content-MD5 field */
+
+/*
+ * mhstore
+ * Put it here because it uses the CT typedef.
+ */
+typedef struct mhstoreinfo *mhstoreinfo_t;
+mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
+int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t);
+void mhstoreinfo_free(mhstoreinfo_t);
+void store_all_messages (mhstoreinfo_t);

diff --git a/uip/mhn.c b/uip/mhn.c
index 1e95d41e70e96e283339099256723fb637906e6f..39d8693372792c748ec5b1bf1ebc12ad0839f458 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -119,12 +119,6 @@ int part_ok (CT, int);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/* mhstoresbr.c */
-typedef struct mhstoreinfo *mhstoreinfo_t;
-mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
-void mhstoreinfo_free(mhstoreinfo_t);
-void store_all_messages (mhstoreinfo_t);
-
 /* mhcachesbr.c */
 void cache_all_messages (CT *);
 

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 67792c525955e902cc1764e6c0e5e99248708e6c..17dcc01db0e6db73dc7db578808d1b49a49e6dfb 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -51,12 +51,6 @@ extern int wcachesw;
 extern char *cache_public;
 extern char *cache_private;
 
-/* mhstoresbr.c */
-typedef struct mhstoreinfo *mhstoreinfo_t;
-mhstoreinfo_t mhstoreinfo_create(CT *, char *, const char *, int, int);
-int mhstoreinfo_files_not_clobbered(const mhstoreinfo_t);
-void mhstoreinfo_free(mhstoreinfo_t);
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -75,9 +69,6 @@ int part_ok (CT, int);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/* mhstoresbr.c */
-void store_all_messages (mhstoreinfo_t);
-
 /* mhfree.c */
 extern CT *cts;
 void freects_done (int) NORETURN;

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index a7cdaf9e98cd5c24dd43600eafcfc4beac9e33f6..ae835fbfdd1267e899a0cd96f18cbdbd271e7a51 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -41,8 +41,6 @@ struct mhstoreinfo {
     enum clobber_policy_t clobber_policy;  /* -clobber selection */
 };
 
-typedef struct mhstoreinfo *mhstoreinfo_t;
-
 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
     mhstoreinfo_t info = mh_xmalloc (sizeof *info);
@@ -83,11 +81,6 @@ int part_ok (CT, int);
 int type_ok (CT, int);
 void flush_errors (void);
 
-/*
- * prototypes
- */
-void store_all_messages (mhstoreinfo_t);
-
 /*
  * static prototypes
  */