remove unnecessary casts

[mmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index d418731..c99b7cd 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
 ** complete copyright information.
 */
 
+#include <sysexits.h>
 #include <h/mh.h>
 #include <h/utils.h>
 
@@ -17,21 +18,14 @@ struct procstr {
 
 static struct procstr procs[] = {
        { "attachment-header",  &attach_hdr },
+       { "sign-header",   &sign_hdr },
+       { "enc-header",    &enc_hdr },
        { "context",       &context },
        { "mh-sequences",  &mh_seq },
-       { "backup-prefix", &backup_prefix },
        { "draft-folder",  &draftfolder },
-       { "altmsg-link",   &altmsglink },
-       { "fileproc",      &fileproc },
        { "listproc",      &listproc },
-       { "mailproc",      &mailproc },
-       { "mhlproc",       &mhlproc },
-       { "postproc",      &postproc },
-       { "rmmproc",       &rmmproc },
        { "sendmail",      &sendmail },
-       { "sendproc",      &sendproc },
-       { "showmimeproc",  &showmimeproc },
-       { "showproc",      &showproc },
+       { "trash-folder",  &trashfolder },
        { "whatnowproc",   &whatnowproc },
        { NULL, NULL }
 };
@@ -42,11 +36,11 @@ static struct node **opp = NULL;
 void
 readconfig(struct node **npp, FILE *ib, char *file, int ctx)
 {
-       register int state;
-       register char *cp;
+       int state;
+       char *cp;
        char name[NAMESZ], field[BUFSIZ];
-       register struct node *np;
-       register struct procstr *ps;
+       struct node *np;
+       struct procstr *ps;
 
        if (npp == NULL && (npp = opp) == NULL) {
                admonish(NULL, "bug: readconfig called but pump not primed");
@@ -58,8 +52,7 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
                                ib)) {
                case FLD:
                case FLDPLUS:
-               case FLDEOF:
-                       np = (struct node *) mh_xmalloc(sizeof(*np));
+                       np = mh_xcalloc(1, sizeof(*np));
                        *npp = np;
                        *(npp = &np->n_next) = NULL;
                        np->n_name = getcpy(name);
@@ -87,20 +80,17 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx)
                                        *ps->procnaddr = np->n_field;
                                        break;
                                }
-                       if (state == FLDEOF)
-                               break;
                        continue;
 
                case BODY:
-               case BODYEOF:
-                       adios(NULL, "no blank lines are permitted in %s",
+                       adios(EX_CONFIG, NULL, "no blank lines are permitted in %s",
                                        file);
 
                case FILEEOF:
                        break;
 
                default:
-                       adios(NULL, "%s is poorly formatted", file);
+                       adios(EX_CONFIG, NULL, "%s is poorly formatted", file);
                }
                break;
        }