[Pspp-cvs] pspp/src/language/data-io ChangeLog print.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/04/25 20:13:05

Modified files:
        src/language/data-io: ChangeLog print.c 

Log message:
        Don't special-case MS-DOS line ends.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/ChangeLog.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/data-io/print.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: pspp/src/language/data-io/ChangeLog
diff -u pspp/src/language/data-io/ChangeLog:1.4 
pspp/src/language/data-io/ChangeLog:1.5
--- pspp/src/language/data-io/ChangeLog:1.4     Mon Apr 24 05:10:00 2006
+++ pspp/src/language/data-io/ChangeLog Tue Apr 25 20:13:05 2006
@@ -1,3 +1,10 @@
+Tue Apr 25 13:11:55 2006  Ben Pfaff  <address@hidden>
+
+       * print.c: Don't special-case MS-DOS line terminators.
+       (macro LINE_END_WIDTH) Removed.
+       (alloc_line) Line ends are 1 byte.
+       (print_trns_proc) Just output \n for line end.
+
 Sun Apr 23 22:05:58 2006  Ben Pfaff  <address@hidden>
 
        Continue reforming error message support.  In this phase, get rid
Index: pspp/src/language/data-io/print.c
diff -u pspp/src/language/data-io/print.c:1.4 
pspp/src/language/data-io/print.c:1.5
--- pspp/src/language/data-io/print.c:1.4       Mon Apr  3 20:07:54 2006
+++ pspp/src/language/data-io/print.c   Tue Apr 25 20:13:05 2006
@@ -846,13 +846,6 @@
   tab_submit (t);
 }
 
-/* PORTME: The number of characters in a line terminator. */
-#ifdef __MSDOS__ 
-#define LINE_END_WIDTH 2       /* \r\n */
-#else
-#define LINE_END_WIDTH 1       /* \n */
-#endif
-
 /* Calculates the maximum possible line width and allocates a buffer
    big enough to contain it */
 static void
@@ -891,7 +884,7 @@
       if (pot_w > w)
        w = pot_w;
     }
-  prt.max_width = w + LINE_END_WIDTH + 1;
+  prt.max_width = w + 2;
   prt.line = xmalloc (prt.max_width);
 }
 
@@ -933,13 +926,7 @@
          {
            if ((t->options & PRT_CMD_MASK) == PRT_PRINT
                 || !(t->options & PRT_BINARY))
-             {
-               /* PORTME: Line ends. */
-#ifdef __MSDOS__
-               buf[len++] = '\r';
-#endif
-               buf[len++] = '\n';
-             }
+              buf[len++] = '\n';
 
            dfm_put_record (t->writer, buf, len);
          }