mhbuildsbr.c: Flip logic, moving goto to then-block; no need for else.

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index b92f699b249cf14812a983e28f25259e9b8b3cfe..d737a2a04599af89241d460e34d3dc87bc597a41 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -1,6 +1,4 @@
-
-/*
- * readconfig.c -- base routine to read nmh configuration files
+/* readconfig.c -- base routine to read nmh configuration files
  *              -- such as nmh profile, context file, or mhn.defaults.
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
@@ -46,19 +44,20 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 {
     int state;
     char *cp;
-    char name[NAMESZ], field[BUFSIZ];
+    char name[NAMESZ], field[NMH_BUFSIZ];
     struct node *np;
     struct procstr *ps;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (npp == NULL && (npp = opp) == NULL) {
        inform("bug: readconfig called but pump not primed, continuing...");
        return;
     }
 
+    gstate = m_getfld_state_init(ib);
     for (;;) {
        int fieldsz = sizeof field;
-       switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {
            case FLD:
            case FLDPLUS:
                NEW(np);
@@ -69,7 +68,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
                    cp = mh_xstrdup(field);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
-                       state = m_getfld (&gstate, name, field, &fieldsz, ib);
+                       state = m_getfld2(&gstate, name, field, &fieldsz);
                        cp = add (field, cp);
                    }
                    np->n_field = trimcpy (cp);