diff options
author | Jim Meyering <meyering@redhat.com> | 2012-01-09 22:56:54 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-01-11 09:27:50 +0100 |
commit | d3227eeb90c8308abd1e6bf08ee253b7a4e78d1d (patch) | |
tree | 3ccee2bcd24ae57b9c9b539cd964b103a5271f4a /src/od.c | |
parent | bfe711db1c07e73a5806647a637f609eb8c1773d (diff) | |
download | coreutils-d3227eeb90c8308abd1e6bf08ee253b7a4e78d1d.tar.xz |
maint: adjust formatting of certain continued strings
Add a rule to ding any source file that has a continued string
with a word in the first column of the following line.
Those tend to trigger malfunction in tools that try to map an
arbitrary line number to an enclosing function name. Of course,
very many strings do precisely this, *when they are part of the
usage function*. So we exempt the body of each usage function.
* src/dircolors.c (main): Separate a long, continued string
into two separately-quoted parts.
* src/od.c (decode_one_format): Likewise.
(decode_one_format, main): Move a space from end of
preceding line to the beginning of the continued line.
* src/tr.c (unquote, string2_extend, validate): Likewise.
* src/seq.c (main): Split in two and use string concatenation.
* src/stat.c (default_format): Use a mix of techniques.
* cfg.mk (sc_prohibit_continued_string_alpha_in_column_1): New rule.
Exempt three files in src: system.h, od.c, printf.c.
Diffstat (limited to 'src/od.c')
-rw-r--r-- | src/od.c | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -640,8 +640,9 @@ decode_one_format (const char *s_orig, const char *s, const char **next, if (MAX_INTEGRAL_TYPE_SIZE < size || integral_type_size[size] == NO_SIZE) { - error (0, 0, _("invalid type string %s;\n\ -this system doesn't provide a %lu-byte integral type"), quote (s_orig), size); + error (0, 0, _("invalid type string %s;\nthis system" + " doesn't provide a %lu-byte integral type"), + quote (s_orig), size); return false; } s = p; @@ -759,8 +760,10 @@ this system doesn't provide a %lu-byte integral type"), quote (s_orig), size); if (size > MAX_FP_TYPE_SIZE || fp_type_size[size] == NO_SIZE) { - error (0, 0, _("invalid type string %s;\n\ -this system doesn't provide a %lu-byte floating point type"), + error (0, 0, + _("invalid type string %s;\n" + "this system doesn't provide a %lu-byte" + " floating point type"), quote (s_orig), size); return false; } @@ -1598,8 +1601,8 @@ main (int argc, char **argv) break; default: error (EXIT_FAILURE, 0, - _("invalid output address radix '%c'; \ -it must be one character from [doxn]"), + _("invalid output address radix '%c';\ + it must be one character from [doxn]"), optarg[0]); break; } |