Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/nmh

[nmh] / uip / fmttest.c

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 850e2d084878a4b079b93c78496c3cb04564e620..90df1e9e67c17fe055e1a3ed4ca36d3a079a09f7 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -625,7 +625,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
      * Read in the message and process the components
      */
 
      * Read in the message and process the components
      */
 

-    for (state = FLD;;) {
+    for (;;) {

        bufsz = sizeof(rbuf);
        state = m_getfld(&gstate, name, rbuf, &bufsz, in);
        switch (state) {
        bufsz = sizeof(rbuf);
        state = m_getfld(&gstate, name, rbuf, &bufsz, in);
        switch (state) {


@@ -650,8 +650,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
            if (fmt_findcomp("body")) {
                if ((i = strlen(rbuf)) < outwidth) {
                    bufsz = min (outwidth, (int) sizeof rbuf - i);
            if (fmt_findcomp("body")) {
                if ((i = strlen(rbuf)) < outwidth) {
                    bufsz = min (outwidth, (int) sizeof rbuf - i);

-                   state = m_getfld(&gstate, name, rbuf + i,
-                                    &bufsz, in);
+                   m_getfld(&gstate, name, rbuf + i, &bufsz, in);

                }
 
                fmt_addcomptext("body", rbuf);
                }
 
                fmt_addcomptext("body", rbuf);