Split one-line condition+body to get gcov results.

[nmh] / uip / prompter.c

diff --git a/uip/prompter.c b/uip/prompter.c
index 58347d47a879afc017f88488e2605ad28627e797..900572b2dea779e2fb44b031ed4a40a60eaf5b75 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -78,7 +78,7 @@ main (int argc, char **argv)
     char *tmpfil;
     m_getfld_state_t gstate = 0;
 
     char *tmpfil;
     m_getfld_state_t gstate = 0;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -214,8 +214,8 @@ main (int argc, char **argv)
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, in);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
                        state = m_getfld (&gstate, name, field, &fieldsz, in);

-                       printf ("%s", field);
-                       fprintf (out, "%s", field);
+                       fputs(field, stdout);
+                       fputs(field, out);

                    }
                } else {
                    /* Else, get value of header field */
                    }
                } else {
                    /* Else, get value of header field */


@@ -235,7 +235,7 @@ abort:
                        do {
                            if (field[0] != ' ' && field[0] != '\t')
                                putc (' ', out);
                        do {
                            if (field[0] != ' ' && field[0] != '\t')
                                putc (' ', out);

-                           fprintf (out, "%s", field);
+                           fputs(field, out);

                        } while (i == 1
                                    && (i = getln (field, sizeof(field))) >= 0);
                        if (i == -1)
                        } while (i == 1
                                    && (i = getln (field, sizeof(field))) >= 0);
                        if (i == -1)


@@ -251,7 +251,7 @@ abort:
                    break;
                fprintf (out, "--------\n");
                if (field[0] == 0 || !prepend)
                    break;
                fprintf (out, "--------\n");
                if (field[0] == 0 || !prepend)

-                   printf ("--------\n");
+                   puts("--------");

                if (field[0]) {
                    if (prepend && body) {
                        printf ("\n--------Enter initial text\n\n");
                if (field[0]) {
                    if (prepend && body) {
                        printf ("\n--------Enter initial text\n\n");


@@ -262,14 +262,14 @@ abort:
                                break;
                            if (buffer[0] == 0)
                                break;
                                break;
                            if (buffer[0] == 0)
                                break;

-                           fprintf (out, "%s", buffer);
+                           fputs(buffer, out);

                        }
                    }
 
                    do {
                        }
                    }
 
                    do {

-                       fprintf (out, "%s", field);
+                       fputs(field, out);

                        if (!rapid && !sigint)
                        if (!rapid && !sigint)

-                           printf ("%s", field);
+                           fputs(field, stdout);

                    } while (state == BODY &&
                            (fieldsz = sizeof field,
                             state = m_getfld (&gstate, name, field, &fieldsz, in)));
                    } while (state == BODY &&
                            (fieldsz = sizeof field,
                             state = m_getfld (&gstate, name, field, &fieldsz, in)));


@@ -286,7 +286,7 @@ abort:
                        break;
                    if (field[0] == 0)
                        break;
                        break;
                    if (field[0] == 0)
                        break;

-                   fprintf (out, "%s", field);
+                   fputs(field, out);

                }
                break;
 
                }
                break;
 


@@ -298,7 +298,7 @@ abort:
     m_getfld_state_destroy (&gstate);
 
     if (body)
     m_getfld_state_destroy (&gstate);
 
     if (body)

-       printf ("--------\n");
+       puts("--------");

 
     fflush (stdout);
     fclose (in);
 
     fflush (stdout);
     fclose (in);