X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Ffmt_addr.c;h=d6218b565f8263c2e05d9582d25bc1ada58fe25c;hp=a2338e361a5be2c3bb8453df809b200d7c433e58;hb=714b5c530ece27ea2835a313013f5b770163403c;hpb=ced6090a330d3d83d0bce709f756aa3d7d65fea4 diff --git a/sbr/fmt_addr.c b/sbr/fmt_addr.c index a2338e3..d6218b5 100644 --- a/sbr/fmt_addr.c +++ b/sbr/fmt_addr.c @@ -22,11 +22,11 @@ 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;\ @@ -49,7 +49,7 @@ static unsigned int bufsiz; /* current size of buf */ */ char * -formataddr (char *orig, char *str) +formataddr(char *orig, char *str) { register int len; register int isgroup; @@ -60,7 +60,7 @@ formataddr (char *orig, char *str) /* if we don't have a buffer yet, get one */ if (bufsiz == 0) { - buf = mh_xmalloc (BUFINCR); + buf = mh_xmalloc(BUFINCR); last_dst = buf; /* XXX */ bufsiz = BUFINCR - 6; /* leave some slop */ bufend = buf + bufsiz; @@ -76,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)) { @@ -95,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)