Removed the space between function names and the opening parenthesis.

[mmh] / uip / mhtest.c

diff --git a/uip/mhtest.c b/uip/mhtest.c
index f8e6e38..621c701 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -88,31 +88,31 @@ int verbosw = 0;
 #define quitser pipeser
 
 /* mhparse.c */
 #define quitser pipeser
 
 /* mhparse.c */

-CT parse_mime (char *);
+CT parse_mime(char *);

 
 /* mhoutsbr.c */
 
 /* mhoutsbr.c */

-int output_message (CT, char *);
+int output_message(CT, char *);

 
 /* mhmisc.c */
 
 /* mhmisc.c */

-int part_ok (CT, int);
-int type_ok (CT, int);
-void set_endian (void);
-void flush_errors (void);
+int part_ok(CT, int);
+int type_ok(CT, int);
+void set_endian(void);
+void flush_errors(void);

 
 /* mhfree.c */
 
 /* mhfree.c */

-void free_content (CT);
+void free_content(CT);

 extern CT *cts;
 extern CT *cts;

-void freects_done (int) NORETURN;
+void freects_done(int) NORETURN;

 
 /*
 ** static prototypes
 */
 
 /*
 ** static prototypes
 */

-static int write_content (CT *, char *);
-static RETSIGTYPE pipeser (int);
+static int write_content(CT *, char *);
+static RETSIGTYPE pipeser(int);

 
 
 int
 
 
 int

-main (int argc, char **argv)
+main(int argc, char **argv)

 {
        int msgnum, *icachesw;
        char *cp, *file = NULL, *folder = NULL;
 {
        int msgnum, *icachesw;
        char *cp, *file = NULL, *folder = NULL;

@@ -127,12 +127,12 @@ main (int argc, char **argv)
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif
 #ifdef LOCALE
        setlocale(LC_ALL, "");
 #endif

-       invo_name = r1bindex (argv[0], '/');
+       invo_name = r1bindex(argv[0], '/');

 
        /* read user profile/context */
        context_read();
 
 
        /* read user profile/context */
        context_read();
 

-       arguments = getarguments (invo_name, argc, argv, 1);
+       arguments = getarguments(invo_name, argc, argv, 1);

        argp = arguments;
 
        /*
        argp = arguments;
 
        /*

@@ -140,20 +140,20 @@ main (int argc, char **argv)
        */
        while ((cp = *argp++)) {
                if (*cp == '-') {
        */
        while ((cp = *argp++)) {
                if (*cp == '-') {

-                       switch (smatch (++cp, switches)) {
+                       switch (smatch(++cp, switches)) {

                        case AMBIGSW:
                        case AMBIGSW:

-                               ambigsw (cp, switches);
-                               done (1);
+                               ambigsw(cp, switches);
+                               done(1);

                        case UNKWNSW:
                        case UNKWNSW:

-                               adios (NULL, "-%s unknown", cp);
+                               adios(NULL, "-%s unknown", cp);

 
                        case HELPSW:
 
                        case HELPSW:

-                               snprintf (buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
-                               print_help (buf, switches, 1);
-                               done (1);
+                               snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+                               print_help(buf, switches, 1);
+                               done(1);

                        case VERSIONSW:
                                print_version(invo_name);
                        case VERSIONSW:
                                print_version(invo_name);

-                               done (1);
+                               done(1);

 
                        case RCACHESW:
                                icachesw = &rcachesw;
 
                        case RCACHESW:
                                icachesw = &rcachesw;

@@ -162,13 +162,14 @@ main (int argc, char **argv)
                                icachesw = &wcachesw;
 do_cache:
                                if (!(cp = *argp++) || *cp == '-')
                                icachesw = &wcachesw;
 do_cache:
                                if (!(cp = *argp++) || *cp == '-')

-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               switch (*icachesw = smatch (cp, caches)) {
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               switch (*icachesw = smatch(cp, caches)) {

                                case AMBIGSW:
                                case AMBIGSW:

-                                       ambigsw (cp, caches);
-                                       done (1);
+                                       ambigsw(cp, caches);
+                                       done(1);

                                case UNKWNSW:
                                case UNKWNSW:

-                                       adios (NULL, "%s unknown", cp);
+                                       adios(NULL, "%s unknown", cp);

                                default:
                                        break;
                                }
                                default:
                                        break;
                                }

@@ -183,32 +184,33 @@ do_cache:
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')

-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s", argp[-2]);

                                if (npart >= NPARTS)
                                if (npart >= NPARTS)

-                                       adios (NULL, "too many parts (starting with %s), %d max",
-                                                  cp, NPARTS);
+                                       adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);

                                parts[npart++] = cp;
                                continue;
 
                        case TYPESW:
                                if (!(cp = *argp++) || *cp == '-')
                                parts[npart++] = cp;
                                continue;
 
                        case TYPESW:
                                if (!(cp = *argp++) || *cp == '-')

-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios(NULL, "missing argument to %s", argp[-2]);

                                if (ntype >= NTYPES)
                                if (ntype >= NTYPES)

-                                       adios (NULL, "too many types (starting with %s), %d max",
+                                       adios(NULL, "too many types (starting with %s), %d max",

                                                   cp, NTYPES);
                                types[ntype++] = cp;
                                continue;
 
                        case FILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                                                   cp, NTYPES);
                                types[ntype++] = cp;
                                continue;
 
                        case FILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               file = *cp == '-' ? cp : path (cp, TFILE);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               file = *cp == '-' ? cp : path(cp, TFILE);

                                continue;
 
                        case OUTFILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
                                continue;
 
                        case OUTFILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))

-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               outfile = *cp == '-' ? cp : path (cp, TFILE);
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               outfile = *cp == '-' ? cp : path(cp, TFILE);

                                continue;
 
                        case VERBSW:
                                continue;
 
                        case VERBSW:

@@ -224,9 +226,9 @@ do_cache:
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)

-                               adios (NULL, "only one folder at a time!");
+                               adios(NULL, "only one folder at a time!");

                        else
                        else

-                               folder = pluspath (cp);
+                               folder = pluspath(cp);

                } else
                        app_msgarg(&msgs, cp);
        }
                } else
                        app_msgarg(&msgs, cp);
        }

@@ -235,45 +237,45 @@ do_cache:
        parts[npart] = NULL;
        types[ntype] = NULL;
 
        parts[npart] = NULL;
        types[ntype] = NULL;
 

-       set_endian ();
+       set_endian();

 
        if (outfile == NULL)
 
        if (outfile == NULL)

-               adios (NULL, "must specify output file");
+               adios(NULL, "must specify output file");

 
        /* Check for public cache location */
 
        /* Check for public cache location */

-       if ((cache_public = context_find (nmhcache)) && *cache_public != '/')
+       if ((cache_public = context_find(nmhcache)) && *cache_public != '/')

                cache_public = NULL;
 
        /* Check for private cache location */
                cache_public = NULL;
 
        /* Check for private cache location */

-       if (!(cache_private = context_find (nmhprivcache)))
+       if (!(cache_private = context_find(nmhprivcache)))

                cache_private = ".cache";
                cache_private = ".cache";

-       cache_private = getcpy (m_maildir (cache_private));
+       cache_private = getcpy(m_maildir(cache_private));

 
        /*
        ** Check for storage directory.  If specified,
        ** then store temporary files there.  Else we
        ** store them in standard nmh directory.
        */
 
        /*
        ** Check for storage directory.  If specified,
        ** then store temporary files there.  Else we
        ** store them in standard nmh directory.
        */

-       if ((cp = context_find (nmhstorage)) && *cp)
-               tmp = concat (cp, "/", invo_name, NULL);
+       if ((cp = context_find(nmhstorage)) && *cp)
+               tmp = concat(cp, "/", invo_name, NULL);

        else
        else

-               tmp = add (m_maildir (invo_name), NULL);
+               tmp = add(m_maildir(invo_name), NULL);

 
 

-       if (!context_find ("path"))
-               free (path ("./", TFOLDER));
+       if (!context_find("path"))
+               free(path("./", TFOLDER));

 
        if (file && msgs.size)
 
        if (file && msgs.size)

-               adios (NULL, "cannot specify msg and file at same time!");
+               adios(NULL, "cannot specify msg and file at same time!");

 
        /*
        ** check if message is coming from file
        */
        if (file) {
 
        /*
        ** check if message is coming from file
        */
        if (file) {

-               if (!(cts = (CT *) calloc ((size_t) 2, sizeof(*cts))))
-                       adios (NULL, "out of memory");
+               if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
+                       adios(NULL, "out of memory");

                ctp = cts;
 
                ctp = cts;
 

-               if ((ct = parse_mime (file)));
+               if ((ct = parse_mime(file)));

                        *ctp++ = ct;
        } else {
                /*
                        *ctp++ = ct;
        } else {
                /*

@@ -282,47 +284,48 @@ do_cache:
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)
                if (!msgs.size)
                        app_msgarg(&msgs, "cur");
                if (!folder)

-                       folder = getfolder (1);
-               maildir = m_maildir (folder);
+                       folder = getfolder(1);
+               maildir = m_maildir(folder);

 
 

-               if (chdir (maildir) == NOTOK)
-                       adios (maildir, "unable to change directory to");
+               if (chdir(maildir) == NOTOK)
+                       adios(maildir, "unable to change directory to");

 
                /* read folder and create message structure */
 
                /* read folder and create message structure */

-               if (!(mp = folder_read (folder)))
-                       adios (NULL, "unable to read folder %s", folder);
+               if (!(mp = folder_read(folder)))
+                       adios(NULL, "unable to read folder %s", folder);

 
                /* check for empty folder */
                if (mp->nummsg == 0)
 
                /* check for empty folder */
                if (mp->nummsg == 0)

-                       adios (NULL, "no messages in %s", folder);
+                       adios(NULL, "no messages in %s", folder);

 
                /* parse all the message ranges/sequences and set SELECTED */
                for (msgnum = 0; msgnum < msgs.size; msgnum++)
 
                /* parse all the message ranges/sequences and set SELECTED */
                for (msgnum = 0; msgnum < msgs.size; msgnum++)

-                       if (!m_convert (mp, msgs.msgs[msgnum]))
-                               done (1);
-               seq_setprev (mp);  /* set the previous-sequence */
+                       if (!m_convert(mp, msgs.msgs[msgnum]))
+                               done(1);
+               seq_setprev(mp);  /* set the previous-sequence */

 
 

-               if (!(cts = (CT *) calloc ((size_t) (mp->numsel + 1), sizeof(*cts))))
-                       adios (NULL, "out of memory");
+               if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
+                               sizeof(*cts))))
+                       adios(NULL, "out of memory");

                ctp = cts;
 
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                        if (is_selected(mp, msgnum)) {
                                char *msgnam;
 
                ctp = cts;
 
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                        if (is_selected(mp, msgnum)) {
                                char *msgnam;
 

-                               msgnam = m_name (msgnum);
-                               if ((ct = parse_mime (msgnam)))
+                               msgnam = m_name(msgnum);
+                               if ((ct = parse_mime(msgnam)))

                                        *ctp++ = ct;
                        }
                }
        }
 
        if (!*cts)
                                        *ctp++ = ct;
                        }
                }
        }
 
        if (!*cts)

-               done (1);
+               done(1);

 
        userrs = 1;
 
        userrs = 1;

-       SIGNAL (SIGQUIT, quitser);
-       SIGNAL (SIGPIPE, pipeser);
+       SIGNAL(SIGQUIT, quitser);
+       SIGNAL(SIGPIPE, pipeser);

 
        /*
        ** Get the associated umask for the relevant contents.
 
        /*
        ** Get the associated umask for the relevant contents.

@@ -331,8 +334,8 @@ do_cache:
                struct stat st;
 
                ct = *ctp;
                struct stat st;
 
                ct = *ctp;

-               if (type_ok (ct, 1) && !ct->c_umask) {
-                       if (stat (ct->c_file, &st) != NOTOK)
+               if (type_ok(ct, 1) && !ct->c_umask) {
+                       if (stat(ct->c_file, &st) != NOTOK)

                                ct->c_umask = ~(st.st_mode & 0777);
                        else
                                ct->c_umask = ~m_gmprot();
                                ct->c_umask = ~(st.st_mode & 0777);
                        else
                                ct->c_umask = ~m_gmprot();

@@ -342,53 +345,53 @@ do_cache:
        /*
        ** Write the content to a file
        */
        /*
        ** Write the content to a file
        */

-       write_content (cts, outfile);
+       write_content(cts, outfile);

 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)
 
        /* Now free all the structures for the content */
        for (ctp = cts; *ctp; ctp++)

-               free_content (*ctp);
+               free_content(*ctp);

 
 

-       free ((char *) cts);
+       free((char *) cts);

        cts = NULL;
 
        /* If reading from a folder, do some updating */
        if (mp) {
        cts = NULL;
 
        /* If reading from a folder, do some updating */
        if (mp) {

-               context_replace (pfolder, folder);  /* update current folder */
-               seq_setcur (mp, mp->hghsel);  /* update current message */
-               seq_save (mp);  /* synchronize sequences  */
-               context_save ();  /* save the context file  */
+               context_replace(pfolder, folder);  /* update current folder */
+               seq_setcur(mp, mp->hghsel);  /* update current message */
+               seq_save(mp);  /* synchronize sequences  */
+               context_save();  /* save the context file  */

        }
 
        }
 

-       done (0);
+       done(0);

        return 1;
 }
 
 
 static int
        return 1;
 }
 
 
 static int

-write_content (CT *cts, char *outfile)
+write_content(CT *cts, char *outfile)

 {
        CT ct, *ctp;
 
        for (ctp = cts; *ctp; ctp++) {
                ct = *ctp;
 {
        CT ct, *ctp;
 
        for (ctp = cts; *ctp; ctp++) {
                ct = *ctp;

-               output_message (ct, outfile);
+               output_message(ct, outfile);

        }
 
        }
 

-       flush_errors ();
+       flush_errors();

        return OK;
 }
 
 
 static RETSIGTYPE
        return OK;
 }
 
 
 static RETSIGTYPE

-pipeser (int i)
+pipeser(int i)

 {
        if (i == SIGQUIT) {
 {
        if (i == SIGQUIT) {

-               unlink ("core");
-               fflush (stdout);
-               fprintf (stderr, "\n");
-               fflush (stderr);
+               unlink("core");
+               fflush(stdout);
+               fprintf(stderr, "\n");
+               fflush(stderr);

        }
 
        }
 

-       done (1);
+       done(1);

        /* NOTREACHED */
 }
        /* NOTREACHED */
 }