X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..c3bcb67006e022443a1a424cb8f76c98e809050d:/sbr/readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 4e02738c..866747a2 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -23,7 +23,6 @@ static struct procstr procs[] = {
     { "fileproc",      &fileproc },
     { "formatproc",    &formatproc },
     { "incproc",       &incproc },
-    { "installproc",   &installproc },
     { "lproc",         &lproc },
     { "mailproc",      &mailproc },
     { "mhlproc",       &mhlproc },
@@ -52,17 +51,16 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
     char name[NAMESZ], field[BUFSIZ];
     register struct node *np;
     register struct procstr *ps;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (npp == NULL && (npp = opp) == NULL) {
 	admonish (NULL, "bug: readconfig called but pump not primed");
 	return;
     }
 
-    m_getfld_state_init (&gstate);
     for (;;) {
 	int fieldsz = sizeof field;
-	switch (state = m_getfld (gstate, name, field, &fieldsz, ib)) {
+	switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
 	    case FLD:
 	    case FLDPLUS:
 		np = (struct node *) mh_xmalloc (sizeof(*np));
@@ -73,7 +71,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 		    cp = getcpy (field);
 		    while (state == FLDPLUS) {
 			fieldsz = sizeof field;
-			state = m_getfld (gstate, name, field, &fieldsz, ib);
+			state = m_getfld (&gstate, name, field, &fieldsz, ib);
 			cp = add (field, cp);
 		    }
 		    np->n_field = trimcpy (cp);
@@ -145,7 +143,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 	    if (strlen (np->n_name) > 0	 &&  strcmp ("#", np->n_name)) {
 		struct node *np2;
 		for (np2 = np->n_next; np2; np2 = np2->n_next) {
-		    if (! mh_strcasecmp (np->n_name, np2->n_name)) {
+		    if (! strcasecmp (np->n_name, np2->n_name)) {
 			admonish (NULL, "multiple \"%s\" profile components "
 					"in %s, ignoring \"%s\"",
 				  np->n_name, defpath, np2->n_field);