X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fdropsbr.c;h=84435a2eb290cb1ed383ee5f13eecb4320f89583;hb=1ae9fa8a84998e44e0234543162e257815d7e972;hp=7f432eafa35567511bb54e2965414529e7cb2830;hpb=4885712264980e6cbc2039f9158027bee9213475;p=mmh

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 7f432ea..84435a2 100644
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -10,17 +10,12 @@
  */
 
 #include <h/nmh.h>
+#include <h/utils.h>
 
-#ifndef	MMDFONLY
-# include <h/mh.h>
-# include <h/dropsbr.h>
-# include <h/mts.h>
-# include <h/tws.h>
-#else
-# include "dropsbr.h"
-# include "strings.h"
-# include "mmdfonly.h"
-#endif
+#include <h/mh.h>
+#include <h/dropsbr.h>
+#include <h/mts.h>
+#include <h/tws.h>
 
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
@@ -224,14 +219,8 @@ mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
 	if (dp >= ep) {
 	    register int    curlen = dp - pp;
 
-	    cp = (struct drop *) realloc ((char *) pp,
+	    cp = (struct drop *) mh_xrealloc ((char *) pp,
 		                    (size_t) (len += MAXFOLDER) * sizeof(*pp));
-	    if (cp == NULL) {
-		if (noisy)
-		    admonish (NULL, "unable to allocate drop storage");
-		free ((char *) pp);
-		return 0;
-	    }
 	    dp = cp + curlen, ep = (pp = cp) + len - 1;
 	}
     }
@@ -387,7 +376,7 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 			    fp = strchr(ep + 1, '\n');
 			tp = dctime(dlocaltimenow());
 			snprintf (buffer, sizeof(buffer), "From %.*s  %s",
-				fp - ep, ep, tp);
+				(int)(fp - ep), ep, tp);
 		    } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
 			/*
 			 * Change the "X-Envelope-From:" field
@@ -499,10 +488,10 @@ map_name (char *file)
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
 	dp = cp + strlen (cp);
     if (cp == file)
-	snprintf (buffer, sizeof(buffer), ".%.*s%s", dp - cp, cp, ".map");
+	snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, ".map");
     else
 	snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
-		cp - file, file, dp - cp, cp, ".map");
+		(int)(cp - file), file, (int)(dp - cp), cp, ".map");
 
     return buffer;
 }