Removed the space between function names and the opening parenthesis.

[mmh] / sbr / fmt_scan.c

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 8a8e4c1..ac98883 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -29,7 +29,7 @@
 
 #define NFMTS MAXARGS
 
-extern char *formataddr ();  /* hook for custom address formatting */
+extern char *formataddr();  /* hook for custom address formatting */
 
 #ifdef LBL
 struct msgs *fmt_current_folder; /* current folder (set by main program) */
@@ -41,9 +41,9 @@ struct mailname fmt_mnull;
 /*
 ** static prototypes
 */
-static int match (char *, char *);
-static char *get_x400_friendly (char *, char *, int);
-static int get_x400_comp (char *, char *, char *, int);
+static int match(char *, char *);
+static char *get_x400_friendly(char *, char *, int);
+static int get_x400_comp(char *, char *, char *, int);
 
 
 /*
@@ -52,7 +52,7 @@ static int get_x400_comp (char *, char *, char *, int);
 */
 
 static int
-match (char *str, char *sub)
+match(char *str, char *sub)
 {
        int c1, c2;
        char *s1, *s2;
@@ -208,7 +208,7 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
 }
 
 static void
-cpstripped (char **start, char *end, char *str)
+cpstripped(char **start, char *end, char *str)
 {
        int c;
        char *s = str;
@@ -248,7 +248,7 @@ static char *lmonth[] = {
 };
 
 static char *
-get_x400_friendly (char *mbox, char *buffer, int buffer_len)
+get_x400_friendly(char *mbox, char *buffer, int buffer_len)
 {
        char given[BUFSIZ], surname[BUFSIZ];
 
@@ -259,40 +259,40 @@ get_x400_friendly (char *mbox, char *buffer, int buffer_len)
        if (*mbox != '/')
                return NULL;
 
-       if (get_x400_comp (mbox, "/PN=", buffer, buffer_len)) {
+       if (get_x400_comp(mbox, "/PN=", buffer, buffer_len)) {
                for (mbox = buffer; (mbox = strchr(mbox, '.')); )
                        *mbox++ = ' ';
 
                return buffer;
        }
 
-       if (!get_x400_comp (mbox, "/S=", surname, sizeof(surname)))
+       if (!get_x400_comp(mbox, "/S=", surname, sizeof(surname)))
                return NULL;
 
-       if (get_x400_comp (mbox, "/G=", given, sizeof(given)))
-               snprintf (buffer, buffer_len, "%s %s", given, surname);
+       if (get_x400_comp(mbox, "/G=", given, sizeof(given)))
+               snprintf(buffer, buffer_len, "%s %s", given, surname);
        else
-               snprintf (buffer, buffer_len, "%s", surname);
+               snprintf(buffer, buffer_len, "%s", surname);
 
        return buffer;
 }
 
 static int
-get_x400_comp (char *mbox, char *key, char *buffer, int buffer_len)
+get_x400_comp(char *mbox, char *key, char *buffer, int buffer_len)
 {
        int idx;
        char *cp;
 
-       if ((idx = stringdex (key, mbox)) < 0
-               || !(cp = strchr(mbox += idx + strlen (key), '/')))
+       if ((idx = stringdex(key, mbox)) < 0
+               || !(cp = strchr(mbox += idx + strlen(key), '/')))
                return 0;
 
-       snprintf (buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
+       snprintf(buffer, buffer_len, "%*.*s", (int)(cp - mbox), (int)(cp - mbox), mbox);
        return 1;
 }
 
 struct format *
-fmt_scan (struct format *format, char *scanl, int width, int *dat)
+fmt_scan(struct format *format, char *scanl, int width, int *dat)
 {
        char *cp, *ep;
        unsigned char *sp;
@@ -324,10 +324,10 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                switch (fmt->f_type) {
 
                case FT_COMP:
-                       cpstripped (&cp, ep, fmt->f_comp->c_text);
+                       cpstripped(&cp, ep, fmt->f_comp->c_text);
                        break;
                case FT_COMPF:
-                       cptrimmed (&cp, fmt->f_comp->c_text, fmt->f_width, fmt->f_fill, ep - cp);
+                       cptrimmed(&cp, fmt->f_comp->c_text, fmt->f_width, fmt->f_fill, ep - cp);
                        break;
 
                case FT_LIT:
@@ -350,13 +350,13 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        break;
 
                case FT_STR:
-                       cpstripped (&cp, ep, str);
+                       cpstripped(&cp, ep, str);
                        break;
                case FT_STRF:
-                       cptrimmed (&cp, str, fmt->f_width, fmt->f_fill, ep - cp);
+                       cptrimmed(&cp, str, fmt->f_width, fmt->f_fill, ep - cp);
                        break;
                case FT_STRFW:
-                       adios (NULL, "internal error (FT_STRFW)");
+                       adios(NULL, "internal error (FT_STRFW)");
 
                case FT_NUM:
                        n = snprintf(cp, ep - cp + 1, "%d", value);
@@ -368,7 +368,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        }
                        break;
                case FT_NUMF:
-                       cpnumber (&cp, value, fmt->f_width, fmt->f_fill, ep - cp);
+                       cpnumber(&cp, value, fmt->f_width, fmt->f_fill, ep - cp);
                        break;
 
                case FT_CHAR:
@@ -414,7 +414,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        break;
 
                case FT_IF_MATCH:
-                       if (!(value = (str && match (str, fmt->f_text)))) {
+                       if (!(value = (str && match(str, fmt->f_text)))) {
                                fmt += fmt->f_skip;
                                continue;
                        }
@@ -422,20 +422,20 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
                case FT_V_MATCH:
                        if (str)
-                               value = match (str, fmt->f_text);
+                               value = match(str, fmt->f_text);
                        else
                                value = 0;
                        break;
 
                case FT_IF_AMATCH:
-                       if (!(value = (str && uprf (str, fmt->f_text)))) {
+                       if (!(value = (str && uprf(str, fmt->f_text)))) {
                                fmt += fmt->f_skip;
                                continue;
                        }
                        break;
 
                case FT_V_AMATCH:
-                       value = uprf (str, fmt->f_text);
+                       value = uprf(str, fmt->f_text);
                        break;
 
                case FT_S_NONNULL:
@@ -472,11 +472,11 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        str = fmt->f_text;
                        break;
                case FT_LS_GETENV:
-                       if (!(str = getenv (fmt->f_text)))
+                       if (!(str = getenv(fmt->f_text)))
                                str = "";
                        break;
                case FT_LS_CFIND:
-                       if (!(str = context_find (fmt->f_text)))
+                       if (!(str = context_find(fmt->f_text)))
                                str = "";
                        break;
 
@@ -583,24 +583,24 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        str = lmonth[fmt->f_comp->c_tws->tw_mon];
                        break;
                case FT_LS_ZONE:
-                       str = dtwszone (fmt->f_comp->c_tws);
+                       str = dtwszone(fmt->f_comp->c_tws);
                        break;
                case FT_LV_YEAR:
                        value = fmt->f_comp->c_tws->tw_year;
                        break;
                case FT_LV_WDAY:
                        if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
-                               set_dotw (tws);
+                               set_dotw(tws);
                        value = tws->tw_wday;
                        break;
                case FT_LS_DAY:
                        if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
-                               set_dotw (tws);
+                               set_dotw(tws);
                        str = tw_dotw[tws->tw_wday];
                        break;
                case FT_LS_WEEKDAY:
                        if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
-                               set_dotw (tws);
+                               set_dotw(tws);
                        str = tw_ldotw[tws->tw_wday];
                        break;
                case FT_LV_YDAY:
@@ -620,7 +620,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        break;
                case FT_LV_DAYF:
                        if (!(((tws = fmt->f_comp->c_tws)->tw_flags) & (TW_SEXP|TW_SIMP)))
-                               set_dotw (tws);
+                               set_dotw(tws);
                        switch (fmt->f_comp->c_tws->tw_flags & TW_SDAY) {
                                case TW_SEXP:
                                        value = 1; break;
@@ -639,10 +639,10 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        value = fmt->f_comp->c_tws->tw_flags & TW_DST;
                        break;
                case FT_LS_822DATE:
-                       str = dasctime (fmt->f_comp->c_tws , TW_ZONE);
+                       str = dasctime(fmt->f_comp->c_tws , TW_ZONE);
                        break;
                case FT_LS_PRETTY:
-                       str = dasctime (fmt->f_comp->c_tws, TW_NULL);
+                       str = dasctime(fmt->f_comp->c_tws, TW_NULL);
                        break;
 
                case FT_LS_PERS:
@@ -685,7 +685,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                goto unfriendly;
                        if ((str = mn->m_pers) == NULL) {
                                if ((str = mn->m_note)) {
-                                       strncpy (buffer, str, sizeof(buffer));
+                                       strncpy(buffer, str, sizeof(buffer));
                                        buffer[sizeof(buffer)-1] = '\0';
                                        str = buffer;
                                        if (*str == '(')
@@ -699,7 +699,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                                        else
                                                                break;
                                        }
-                               } else if (!(str = get_x400_friendly (mn->m_mbox,
+                               } else if (!(str = get_x400_friendly(mn->m_mbox,
                                        buffer, sizeof(buffer)))) {
                unfriendly: ;
                                        switch (mn->m_type) {
@@ -707,13 +707,13 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                                str = mn->m_mbox;
                                                break;
                                        case UUCPHOST:
-                                               snprintf (buffer, sizeof(buffer), "%s!%s",
+                                               snprintf(buffer, sizeof(buffer), "%s!%s",
                                                        mn->m_host, mn->m_mbox);
                                                str = buffer;
                                                break;
                                        default:
                                                if (mn->m_mbox) {
-                                                       snprintf (buffer, sizeof(buffer), "%s@%s",
+                                                       snprintf(buffer, sizeof(buffer), "%s@%s",
                                                                mn->m_mbox, mn->m_host);
                                                        str= buffer;
                                                } else
@@ -782,7 +782,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                *comp->c_tws = *tws;
                                comp->c_flags &= ~CF_TRUE;
                        } else if ((comp->c_flags & CF_DATEFAB) == 0) {
-                               memset ((char *) comp->c_tws, 0, sizeof *comp->c_tws);
+                               memset((char *) comp->c_tws, 0, sizeof *comp->c_tws);
                                comp->c_flags = CF_TRUE;
                        }
                        comp->c_flags |= CF_PARSED;
@@ -793,7 +793,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        ** hook for custom address list formatting
                        ** (see replsbr.c)
                        */
-                       str = formataddr (savestr, str);
+                       str = formataddr(savestr, str);
                        break;
 
                case FT_PUTADDR:
@@ -811,9 +811,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
 
                        lp = str;
                        wid = value;
-                       len = strlen (str);
+                       len = strlen(str);
                        sp = fmt->f_text;
-                       indent = strlen (sp);
+                       indent = strlen(sp);
                        wid -= indent;
                        while( (c = *sp++) && cp < ep)
                                *cp++ = c;
@@ -847,7 +847,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                                *cp++ = ' ';
                                }
                        }
-                       cpstripped (&cp, ep, lp);
+                       cpstripped(&cp, ep, lp);
                        }
                        break;
 
@@ -856,9 +856,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        if (comp->c_flags & CF_PARSED)
                                break;
                        if (comp->c_mn != &fmt_mnull)
-                               mnfree (comp->c_mn);
+                               mnfree(comp->c_mn);
                        if ((sp = comp->c_text) && (sp = getname(sp)) &&
-                               (mn = getm (sp, NULL, 0, fmt_norm, NULL))) {
+                               (mn = getm(sp, NULL, 0, fmt_norm, NULL))) {
                                comp->c_mn = mn;
                                while (getname(""))
                                        ;
@@ -878,9 +878,9 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                        */
                        comp = fmt->f_comp;
                        if (comp->c_mn != &fmt_mnull)
-                               mnfree (comp->c_mn);
+                               mnfree(comp->c_mn);
                        if ((sp = comp->c_text) && (sp = getname(sp)) &&
-                               (mn = getm (sp, NULL, 0, AD_NAME, NULL))) {
+                               (mn = getm(sp, NULL, 0, AD_NAME, NULL))) {
                                comp->c_mn = mn;
                                if (ismymbox(mn))
                                        comp->c_flags |= CF_TRUE;
@@ -888,7 +888,7 @@ fmt_scan (struct format *format, char *scanl, int width, int *dat)
                                        comp->c_flags &= ~CF_TRUE;
                                while ((sp = getname(sp)))
                                        if ((comp->c_flags & CF_TRUE) == 0 &&
-                                               (mn = getm (sp, NULL, 0, AD_NAME, NULL)))
+                                               (mn = getm(sp, NULL, 0, AD_NAME, NULL)))
                                                if (ismymbox(mn))
                                                        comp->c_flags |= CF_TRUE;
                        } else {