From: Bruno Haible Date: Sun, 25 Feb 2024 14:48:47 +0000 (+0100) Subject: bitset: Avoid newlines at the end of translatable strings. X-Git-Tag: v1.0~376 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=49cb4033aeae4426076a599c1385b7802c56c919;p=gnulib.git bitset: Avoid newlines at the end of translatable strings. * lib/bitset/stats.c (bitset_percent_histogram_print, bitset_log_histogram_print): Print a newline after msg. (bitset_stats_print_1): Don't include a newline in the argument of bitset_percent_histogram_print or bitset_log_histogram_print. (bitset_stats_print): Move newlines outside of translatable strings. --- diff --git a/ChangeLog b/ChangeLog index 1910933eb7..511a9f247e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2024-02-25 Bruno Haible + + bitset: Avoid newlines at the end of translatable strings. + * lib/bitset/stats.c (bitset_percent_histogram_print, + bitset_log_histogram_print): Print a newline after msg. + (bitset_stats_print_1): Don't include a newline in the argument of + bitset_percent_histogram_print or bitset_log_histogram_print. + (bitset_stats_print): Move newlines outside of translatable strings. + 2024-02-24 Collin Funk gnulib-tool.py: Follow gnulib-tool changes, part 28. diff --git a/lib/bitset/stats.c b/lib/bitset/stats.c index a32b0cfd08..5c40fc9466 100644 --- a/lib/bitset/stats.c +++ b/lib/bitset/stats.c @@ -115,7 +115,7 @@ bitset_percent_histogram_print (FILE *file, const char *name, const char *msg, if (!total) return; - fprintf (file, "%s %s", name, msg); + fprintf (file, "%s %s\n", name, msg); for (unsigned i = 0; i < n_bins; i++) fprintf (file, "%.0f-%.0f%%\t%8u (%5.1f%%)\n", i * 100.0 / n_bins, @@ -147,7 +147,7 @@ bitset_log_histogram_print (FILE *file, const char *name, const char *msg, /* 2 * ceil (log10 (2) * (N - 1)) + 1. */ unsigned max_width = 2 * (unsigned) (0.30103 * (n_bins - 1) + 0.9999) + 1; - fprintf (file, "%s %s", name, msg); + fprintf (file, "%s %s\n", name, msg); { unsigned i; for (i = 0; i < 2; i++) @@ -195,13 +195,13 @@ bitset_stats_print_1 (FILE *file, const char *name, fprintf (file, _("%u bitset_lists\n"), stats->lists); - bitset_log_histogram_print (file, name, _("count log histogram\n"), + bitset_log_histogram_print (file, name, _("count log histogram"), BITSET_LOG_COUNT_BINS, stats->list_counts); - bitset_log_histogram_print (file, name, _("size log histogram\n"), + bitset_log_histogram_print (file, name, _("size log histogram"), BITSET_LOG_SIZE_BINS, stats->list_sizes); - bitset_percent_histogram_print (file, name, _("density histogram\n"), + bitset_percent_histogram_print (file, name, _("density histogram"), BITSET_DENSITY_BINS, stats->list_density); } @@ -213,10 +213,13 @@ bitset_stats_print (FILE *file, MAYBE_UNUSED bool verbose) if (!bitset_stats_info) return; - fprintf (file, _("Bitset statistics:\n\n")); + fprintf (file, "%s\n\n", _("Bitset statistics:")); if (bitset_stats_info->runs > 1) - fprintf (file, _("Accumulated runs = %u\n"), bitset_stats_info->runs); + { + fprintf (file, _("Accumulated runs = %u"), bitset_stats_info->runs); + fputc ('\n', file); + } for (int i = 0; i < BITSET_TYPE_NUM; i++) bitset_stats_print_1 (file, bitset_type_names[i], @@ -260,7 +263,7 @@ bitset_stats_read (const char *file_name) if (ferror (file)) perror (_("cannot read stats file")); else - fprintf (stderr, _("bad stats file size\n")); + fprintf (stderr, "%s\n", _("bad stats file size")); } if (fclose (file) != 0) perror (_("cannot read stats file"));