X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a514b8a78c447c8abc69386bee9f2c463b1c9362..c36038e4fdfbb0d45b25a8b5e54b9e0af16fe12e:/uip/mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 72079a81..17dcc01d 100644
--- 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;
@@ -269,14 +260,14 @@ do_cache:
      * check if message is coming from file
      */
     if (file) {
-	if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
+	if (!(cts = (CT *) mh_xcalloc ((size_t) 2, sizeof(*cts))))
 	    adios (NULL, "out of memory");
 	ctp = cts;
 
 	if ((ct = parse_mime (file))) {
 	    *ctp++ = ct;
 	    if (outfile) {
-		ct->c_storage = outfile;
+		ct->c_storage = add (outfile, NULL);
 	    }
         }
     } else {
@@ -306,7 +297,7 @@ do_cache:
 		done (1);
 	seq_setprev (mp);	/* set the previous-sequence */
 
-	if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
+	if (!(cts = (CT *) mh_xcalloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
 	    adios (NULL, "out of memory");
 	ctp = cts;