X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d6b2ae5fa68b9a82ffc006c233aef64c5cdb3bd2..34f0ab116ad7734e96127d3cd046861a5c82c11c:/uip/dropsbr.c?ds=inline

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index f6d67a08..0d87a06d 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -156,7 +156,7 @@ mbx_chk_mmdf (int fd)
 
 
 int
-mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
+mbx_read (FILE *fp, long pos, struct drop **drops)
 {
     register int len, size;
     register long ld1, ld2;
@@ -164,12 +164,8 @@ mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
     char buffer[BUFSIZ];
     register struct drop *cp, *dp, *ep, *pp;
 
-    pp = (struct drop *) mh_xcalloc ((size_t) (len = MAXFOLDER), sizeof(*dp));
-    if (pp == NULL) {
-	if (noisy)
-	    admonish (NULL, "unable to allocate drop storage");
-	return NOTOK;
-    }
+    len = MAXFOLDER;
+    pp = mh_xcalloc(len, sizeof *pp);
 
     ld1 = (long) strlen (mmdlm1);
     ld2 = (long) strlen (mmdlm2);
@@ -504,12 +500,7 @@ map_read (char *file, long pos, struct drop **drops, int noisy)
     }
 
     msgp = mp->d_id;
-    dp = (struct drop *) mh_xcalloc ((size_t) (msgp + 1), sizeof(*dp));
-    if (dp == NULL) {
-	close (md);
-	return 0;
-    }
-
+    dp = mh_xcalloc(msgp + 1, sizeof *dp);
     memcpy((char *) dp, (char *) mp, sizeof(*dp));
 
     lseek (md, (off_t) sizeof(*mp), SEEK_SET);
@@ -576,7 +567,7 @@ map_write (char *mailbox, int md, int id, long last, off_t start,
 	    return NOTOK;
 	}
 
-	switch (i = mbx_read (fp, 0, &rp, noisy)) {
+	switch (i = mbx_read (fp, 0, &rp)) {
 	    case NOTOK:
 		fclose (fp);
 		mbx_close (file, fd);