[PPL-devel] [GIT] ppl/ppl(formatted_output): Better name.

[Abramo Bagnara]

Module: ppl/ppl
Branch: formatted_output
Commit: e9f3b884103435828dcb0f95265b394cedf735d2
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e9f3b884103435828dcb0f95265b394cedf735d2

Author: Abramo Bagnara <abramo.bagnara at gmail.com>
Date:   Mon Mar 23 19:52:37 2009 +0100

Better name.

---

 src/c_stream.cc           |    4 ++--
 src/c_stream.h            |    4 ++--
 src/c_streambuf_format.cc |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/c_stream.cc b/src/c_stream.cc
index 0c25bbb..6b3b20b 100644
--- a/src/c_stream.cc
+++ b/src/c_stream.cc
@@ -38,8 +38,8 @@ ppl_io_format_settings ppl_io_format_default_settings = {
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FIRSTLAST
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // NEXT
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LAST
-    { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_FIRST
-    { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // FORCED_NEXT
+    { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_FIRST
+    { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // CHOPPED_NEXT
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRST
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_FIRSTLAST
     { 80, 0, "\n", PPL_IO_FORMAT_ALIGN_LEFT, 0 }, // LONGER_NEXT
diff --git a/src/c_stream.h b/src/c_stream.h
index d54d532..ccde3af 100644
--- a/src/c_stream.h
+++ b/src/c_stream.h
@@ -5,8 +5,8 @@ enum ppl_io_format_line_type {
   PPL_IO_FORMAT_LINE_FIRSTLAST,
   PPL_IO_FORMAT_LINE_NEXT,
   PPL_IO_FORMAT_LINE_LAST,
-  PPL_IO_FORMAT_LINE_FORCED_FIRST,
-  PPL_IO_FORMAT_LINE_FORCED_NEXT,
+  PPL_IO_FORMAT_LINE_CHOPPED_FIRST,
+  PPL_IO_FORMAT_LINE_CHOPPED_NEXT,
   PPL_IO_FORMAT_LINE_LONGER_FIRST,
   PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST,
   PPL_IO_FORMAT_LINE_LONGER_NEXT,
diff --git a/src/c_streambuf_format.cc b/src/c_streambuf_format.cc
index 96b9a64..368a494 100644
--- a/src/c_streambuf_format.cc
+++ b/src/c_streambuf_format.cc
@@ -89,7 +89,7 @@ size_t c_streambuf_format::cb_write(const char *buf, size_t size) {
       }
       continue;
     }
-    type = first ? PPL_IO_FORMAT_LINE_FORCED_FIRST : PPL_IO_FORMAT_LINE_FORCED_NEXT;
+    type = first ? PPL_IO_FORMAT_LINE_CHOPPED_FIRST : PPL_IO_FORMAT_LINE_CHOPPED_NEXT;
     unsigned int limit = len;
     unsigned int max_len = settings->lines[type].length;
     if (max_len > 0 && limit > max_len + 1)
@@ -133,7 +133,7 @@ bool c_streambuf_format::output_line(const char *s, unsigned int n, ppl_io_forma
   switch (type) {
   case PPL_IO_FORMAT_LINE_FIRST:
   case PPL_IO_FORMAT_LINE_FIRSTLAST:
-  case PPL_IO_FORMAT_LINE_FORCED_FIRST:
+  case PPL_IO_FORMAT_LINE_CHOPPED_FIRST:
   case PPL_IO_FORMAT_LINE_LONGER_FIRST:
   case PPL_IO_FORMAT_LINE_LONGER_FIRSTLAST:
   case PPL_IO_FORMAT_LINE_UNTERMINATED_FIRST: