diff options
| author | Carlos O'Donell <carlos@systemhalted.org> | 2017-10-14 15:38:05 -0700 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2017-10-15 14:25:26 -0700 |
| commit | ea91c315bca91fe8d5c36f1aa1dc98d2f0ab4ef4 (patch) | |
| tree | 81e9c269800795efbec996652b86f90e5e31ed2a | |
| parent | 8e57c9432a2b68c8a1e7f4df28f0e8c7acc04753 (diff) | |
| download | glibc-ea91c315bca91fe8d5c36f1aa1dc98d2f0ab4ef4.tar.gz glibc-ea91c315bca91fe8d5c36f1aa1dc98d2f0ab4ef4.tar.xz glibc-ea91c315bca91fe8d5c36f1aa1dc98d2f0ab4ef4.zip | |
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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 17fbe55b5d..1f90c43a32 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 251e7a7a12..afb431b786 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); } |