Changes to m4/src/Attic/input.c,v [branch-1_4]

[Eric Blake]

CVSROOT:        /sources/m4
Module name:    m4
Branch:         branch-1_4
Changes by:     Eric Blake <ericb>      06/10/26 04:45:31

Index: src/input.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/input.c,v
retrieving revision 1.1.1.1.2.28
retrieving revision 1.1.1.1.2.29
diff -u -b -r1.1.1.1.2.28 -r1.1.1.1.2.29
--- src/input.c 25 Oct 2006 20:54:39 -0000      1.1.1.1.2.28
+++ src/input.c 26 Oct 2006 04:45:31 -0000      1.1.1.1.2.29
@@ -87,10 +87,9 @@
       struct
        {
          FILE *fp;             /* input file handle */
-         boolean end;          /* true if peek has seen EOF */
-         boolean close;        /* true if we should close file on pop */
-         int out_line;         /* current output line of previous file */
-         boolean advance_line; /* start_of_input_line from next_char () */
+         boolean end : 1;      /* true if peek has seen EOF */
+         boolean close : 1;    /* true if we should close file on pop */
+         boolean advance_line : 1; /* track previous start_of_input_line */
        }
        u_f;    /* INPUT_FILE */
       builtin_func *func;      /* pointer to macro's function */
@@ -198,7 +197,6 @@
   i->u.u_f.fp = fp;
   i->u.u_f.end = FALSE;
   i->u.u_f.close = close;
-  i->u.u_f.out_line = output_current_line;
   i->u.u_f.advance_line = start_of_input_line;
   output_current_line = -1;
 
@@ -354,7 +352,6 @@
          M4ERROR ((warning_status, errno, "error reading file"));
          retcode = EXIT_FAILURE;
        }
-      output_current_line = isp->u.u_f.out_line;
       start_of_input_line = isp->u.u_f.advance_line;
       if (tmp == NULL)
        {