This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[committed] locale: Don't use \n with record_verbose messages.
- From: Carlos O'Donell <carlos at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Sun, 15 Oct 2017 14:23:32 -0700
- Subject: [committed] locale: Don't use \n with record_verbose messages.
- Authentication-results: sourceware.org; auth=none
I missed 3 instances where record_verbose output an extra \n,
but in record_verbose we already output \n, so this makes the
verbose output have \n\n, which doesn't look nice.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-10-15 Carlos O'Donell <carlos@redhat.com>
* localedata/collate-test.c (allocate_arrays): Don't use \n in
record_verbose messages.
--
Cheers,
Carlos.
>From 0b054e37a906c766ff746d44ade5d0dacdecadd9 Mon Sep 17 00:00:00 2001
From: Carlos O'Donell <carlos@systemhalted.org>
Date: Sat, 14 Oct 2017 15:38:05 -0700
Subject: [PATCH] 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.
---
ChangeLog | 5 +++++
locale/programs/ld-ctype.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eed7450..e09dfdf 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-14 H.J. Lu <hongjiu.lu@intel.com>
* Makeconfig (+link-static-before-libc): Use the first of
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 251e7a7..afb431b 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);
}
--
2.9.5