From: Carlos O'Donell <carlos@systemhalted.org>
Date: Sat, 14 Oct 2017 22:38:05 +0000 (-0700)
Subject: locale: Don't use \n with record_verbose messages.
X-Git-Tag: glibc-2.27~683
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea91c315bca91fe8d5c36f1aa1dc98d2f0ab4ef4;p=thirdparty%2Fglibc.git

locale: Don't use \n with record_verbose messages.

Recorded verbose messages no longer need to pass \n in their
message string since the record_verbose function adds \n to
the messages (like error and warnings do also). The avoids
seeing a double \n for verbose messages.

Signed-off-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 17fbe55b5df..1f90c43a328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-15  Carlos O'Donell  <carlos@redhat.com>
+
+	* localedata/collate-test.c (allocate_arrays): Don't use \n in
+	record_verbose messages.
+
 2017-10-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #22052]
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 251e7a7a12a..afb431b7864 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -3667,7 +3667,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
 	  wctype_table_add (t, ctype->charnames[idx]);
 
       record_verbose (stderr, _("\
-%s: table for class \"%s\": %lu bytes\n"),
+%s: table for class \"%s\": %lu bytes"),
 		      "LC_CTYPE", ctype->classnames[nr],
 		      (unsigned long int) t->result_size);
     }
@@ -3731,7 +3731,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
 			     ctype->map_collection[nr][idx]);
 
       record_verbose (stderr, _("\
-%s: table for map \"%s\": %lu bytes\n"),
+%s: table for map \"%s\": %lu bytes"),
 		      "LC_CTYPE", ctype->mapnames[nr],
 		      (unsigned long int) t->result_size);
     }
@@ -3854,7 +3854,7 @@ allocate_arrays (struct locale_ctype_t *ctype, const struct charmap_t *charmap,
     /* Set the width of L'\0' to 0.  */
     wcwidth_table_add (t, 0, 0);
 
-    record_verbose (stderr, _("%s: table for width: %lu bytes\n"),
+    record_verbose (stderr, _("%s: table for width: %lu bytes"),
 		    "LC_CTYPE", (unsigned long int) t->result_size);
   }