Use va_copy() to get a copy of va_list, instead of using original.

[nmh] / sbr / fmt_addr.c

diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c
index 8e2e5456f1713c0f98b6b0c1ff5e632e6fec9747..37b286a2ea2754fea183a6b2923ab032c7435fe5 100644 (file)
--- a/sbr/fmt_addr.c
+++ b/sbr/fmt_addr.c
@@ -50,7 +50,7 @@ char *
 formataddr (char *orig, char *str)
 {
     int len;
-    int isgroup;
+    bool isgroup;
     char *dst;
     char *cp;
     char *sp;
@@ -79,13 +79,13 @@ formataddr (char *orig, char *str)
     }
 
     /* concatenate all the new addresses onto 'buf' */
-    for (isgroup = 0; (cp = getname (str)); ) {
+    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) {
@@ -95,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);
@@ -108,10 +108,11 @@ formataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
-    return (buf);
+    return buf;
 }
 
-char *concataddr (char *orig, char *str)
+char *
+concataddr (char *orig, char *str)
 {
     return formataddr(orig, str);
 }