Fix spelling errors, including binaries ones

[mmh] / sbr / fmt_addr.c

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index bfb42d8..25c0e16 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -1,10 +1,10 @@
 /*
- * fmt_addr.c -- format an address field (from fmt_scan)
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** fmt_addr.c -- format an address field (from fmt_scan)
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <h/addrsbr.h>
@@ -22,52 +22,53 @@ static unsigned int bufsiz;  /* current size of buf         */
 
 /* check if there's enough room in buf for str.  add more mem if needed */
 #define CHECKMEM(str) \
-       if ((len = strlen (str)) >= bufend - dst) {\
+       if ((len = strlen(str)) >= bufend - dst) {\
                int i = dst - buf;\
                int n = last_dst - buf;\
                bufsiz += ((dst + len - bufend) / BUFINCR + 1) * BUFINCR;\
-               buf = mh_xrealloc (buf, bufsiz);\
+               buf = mh_xrealloc(buf, bufsiz);\
                dst = buf + i;\
                last_dst = buf + n;\
                bufend = buf + bufsiz;\
        }
 
 
-/* fmt_scan will call this routine if the user includes the function
- * "(formataddr {component})" in a format string.  "orig" is the
- * original contents of the string register.  "str" is the address
- * string to be formatted and concatenated onto orig.  This routine
- * returns a pointer to the concatenated address string.
- *
- * We try to not do a lot of malloc/copy/free's (which is why we
- * don't call "getcpy") but still place no upper limit on the
- * length of the result string.
- *
- * This routine is placed in a separate library so it can be
- * overridden by particular programs (e.g., "replsbr").
- */
+/*
+** fmt_scan will call this routine if the user includes the function
+** "(formataddr {component})" in a format string.  "orig" is the
+** original contents of the string register.  "str" is the address
+** string to be formatted and concatenated onto orig.  This routine
+** returns a pointer to the concatenated address string.
+**
+** We try to not do a lot of malloc/copy/free's (which is why we
+** don't call "mh_xstrdup") but still place no upper limit on the
+** length of the result string.
+**
+** This routine is placed in a separate library so it can be
+** overridden by particular programs (e.g., "replsbr").
+*/
 
 char *
-formataddr (char *orig, char *str)
+formataddr(char *orig, char *str)
 {
-       register int len;
-       register int isgroup;
-       register char *dst;
-       register char *cp;
-       register char *sp;
-       register struct mailname *mp = NULL;
+       int len;
+       int isgroup;
+       char *dst;
+       char *cp;
+       char *sp;
+       struct mailname *mp = NULL;
 
        /* if we don't have a buffer yet, get one */
        if (bufsiz == 0) {
-               buf = mh_xmalloc (BUFINCR);
+               buf = mh_xcalloc(BUFINCR, sizeof(char));
                last_dst = buf;  /* XXX */
                bufsiz = BUFINCR - 6;  /* leave some slop */
                bufend = buf + bufsiz;
        }
        /*
-        * If "orig" points to our buffer we can just pick up where we
-        * left off.  Otherwise we have to copy orig into our buffer.
-        */
+       ** If "orig" points to our buffer we can just pick up where we
+       ** left off.  Otherwise we have to copy orig into our buffer.
+       */
        if (orig == buf)
                dst = last_dst;
        else if (!orig || !*orig) {
@@ -75,13 +76,13 @@ formataddr (char *orig, char *str)
                *dst = '\0';
        } else {
                dst = last_dst;  /* XXX */
-               CHECKMEM (orig);
-               CPY (orig);
+               CHECKMEM(orig);
+               CPY(orig);
        }
 
        /* concatenate all the new addresses onto 'buf' */
-       for (isgroup = 0; (cp = getname (str)); ) {
-               if ((mp = getm (cp, NULL, 0, fmt_norm, NULL)) == NULL)
+       for (isgroup = 0; (cp = getname(str)); ) {
+               if ((mp = getm(cp, NULL, 0, fmt_norm, NULL)) == NULL)
                        continue;
 
                if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
@@ -94,14 +95,14 @@ formataddr (char *orig, char *str)
                        *dst++ = ' ';
                }
                if (mp->m_gname) {
-                       CHECKMEM (mp->m_gname);
-                       CPY (mp->m_gname);
+                       CHECKMEM(mp->m_gname);
+                       CPY(mp->m_gname);
                        isgroup++;
                }
-               sp = adrformat (mp);
-               CHECKMEM (sp);
-               CPY (sp);
-               mnfree (mp);
+               sp = adrformat(mp);
+               CHECKMEM(sp);
+               CPY(sp);
+               mnfree(mp);
        }
 
        if (isgroup)