repl.c: Add `static' to function definitions to match declarations.

[nmh] / sbr / fmt_addr.c

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index be9b48390b02bf9abb51a772d2ee63acbc547f6d..4684fa7f1a76ddc30f4164c1ef8485a4314079f6 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -1,6 +1,4 @@
-
-/*
- * fmt_addr.c -- format an address field (from fmt_scan)
+/* 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
@@ -51,12 +49,12 @@ static unsigned int bufsiz; /* current size of buf         */
 char *
 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;
+    bool isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;
 
     /* if we don't have a buffer yet, get one */
     if (bufsiz == 0) {
@@ -81,13 +79,13 @@ formataddr (char *orig, char *str)
     }
 
     /* 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 = false; (cp = getname (str)); ) {
+       if ((mp = getm (cp, NULL, 0, NULL, 0)) == NULL)
            continue;
 
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';
-           isgroup = 0;
+           isgroup = false;
        }
        /* if we get here we're going to add an address */
        if (dst != buf) {
@@ -97,7 +95,7 @@ formataddr (char *orig, char *str)
        if (mp->m_gname) {
            CHECKMEM (mp->m_gname);
            CPY (mp->m_gname);
-           isgroup++;
+           isgroup = true;
        }
        sp = adrformat (mp);
        CHECKMEM (sp);
@@ -110,5 +108,10 @@ formataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
-    return (buf);
+    return buf;
+}
+
+char *concataddr (char *orig, char *str)
+{
+    return formataddr(orig, str);
 }