X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..31422b15ec8e775718ab1d5e08acfba7e04fb1a9:/uip/forwsbr.c

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 592f1eb2..cf043c40 100644
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -54,7 +54,7 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
     register struct comp *cptr;
     struct format *fmt;
     char *cp = NULL;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     /*
      * Open the message we'll be scanning for components
@@ -87,10 +87,9 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
      * these routines?
      */
 
-    m_getfld_state_init (&gstate);
     for (;;) {
 	int msg_count = sizeof msgbuf;
-	state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+	state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
 	switch (state) {
 	    case FLD:
 	    case FLDPLUS:
@@ -104,13 +103,14 @@ build_form (char *form, char *digest, int *dat, char *from, char *to,
 		if (i != -1) {
 		    while (state == FLDPLUS) {
 			msg_count = sizeof msgbuf;
-			state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+			state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
 			fmt_appendcomp(i, name, msgbuf);
 		    }
 		}
-		while (state == FLDPLUS)
+		while (state == FLDPLUS) {
 		    msg_count = sizeof msgbuf;
-		    state = m_getfld (gstate, name, msgbuf, &msg_count, tmp);
+		    state = m_getfld (&gstate, name, msgbuf, &msg_count, tmp);
+		}
 		break;
 
 	    case LENERR: