Replace getcpy() with mh_xstrdup() where the string isn't NULL.

[nmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index f6d67a088c86d66743fb2a5c4b93b00bb72e9220..6f7f365283a57e0c5ae056492b3dcd9c862929f7 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -156,20 +156,16 @@ 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;
-    register char *bp;
+    int len, size;
+    long ld1, ld2;
+    char *bp;
     char buffer[BUFSIZ];
-    register struct drop *cp, *dp, *ep, *pp;
+    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);
@@ -205,7 +201,7 @@ mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
        pos += ld2;
 
        if (dp >= ep) {
-           register int    curlen = dp - pp;
+           int    curlen = dp - pp;
 
            cp = (struct drop *) mh_xrealloc ((char *) pp,
                                    (size_t) (len += MAXFOLDER) * sizeof(*pp));
@@ -225,10 +221,10 @@ int
 mbx_write(char *mailbox, int md, FILE *fp, int id, long last,
            long pos, off_t stop, int mapping, int noisy)
 {
-    register int i, j, size;
+    int i, j, size;
     off_t start;
     long off;
-    register char *cp;
+    char *cp;
     char buffer[BUFSIZ];
 
     off = (long) lseek (md, (off_t) 0, SEEK_CUR);
@@ -432,9 +428,9 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 int
 mbx_size (int md, off_t start, off_t stop)
 {
-    register int i, fd;
-    register long pos;
-    register FILE *fp;
+    int i, fd;
+    long pos;
+    FILE *fp;
 
     if ((fd = dup (md)) == NOTOK || (fp = fdopen (fd, "r")) == NULL) {
        if (fd != NOTOK)
@@ -473,7 +469,7 @@ mbx_close (char *mailbox, int md)
 char *
 map_name (char *file)
 {
-    register char *cp, *dp;
+    char *cp, *dp;
     static char buffer[BUFSIZ];
 
     if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
@@ -491,10 +487,10 @@ map_name (char *file)
 int
 map_read (char *file, long pos, struct drop **drops, int noisy)
 {
-    register int i, md, msgp;
-    register char *cp;
+    int i, md, msgp;
+    char *cp;
     struct drop d;
-    register struct drop *mp, *dp;
+    struct drop *mp, *dp;
 
     if ((md = open (cp = map_name (file), O_RDONLY)) == NOTOK
            || map_chk (cp, md, mp = &d, pos, noisy)) {
@@ -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);
@@ -519,7 +510,7 @@ map_read (char *file, long pos, struct drop **drops, int noisy)
        free ((char *) dp);
     } else {
 #ifdef NTOHLSWAP
-       register struct drop *tdp;
+       struct drop *tdp;
        int j;
 
        for (j = 0, tdp = dp; j < i / sizeof(*dp); j++, tdp++) {
@@ -542,12 +533,12 @@ int
 map_write (char *mailbox, int md, int id, long last, off_t start,
            off_t stop, long pos, int size, int noisy)
 {
-    register int i;
+    int i;
     int clear, fd, td;
     char *file;
-    register struct drop *dp;
+    struct drop *dp;
     struct drop d1, d2, *rp;
-    register FILE *fp;
+    FILE *fp;
     struct stat st;
 
     if ((fd = map_open (file = map_name (mailbox), md)) == NOTOK)
@@ -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);
@@ -657,7 +648,7 @@ map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
 {
     ssize_t count;
     struct drop d, tmpd;
-    register struct drop *dl;
+    struct drop *dl;
 
     if (read (fd, (char *) &tmpd, sizeof(*dp)) != sizeof(*dp)) {
 #ifdef notdef