diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-02-18 23:52:26 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-02-19 15:41:16 +0100 |
| commit | 59b803e3d02ff87b5997e2f374101d6f50216298 (patch) | |
| tree | d420a485fc52327fe8118616ee38f109d3ad49a5 /src | |
| parent | 4f3ff2e7007a6591294e1a656782b5f239f9840c (diff) | |
| download | coreutils-59b803e3d02ff87b5997e2f374101d6f50216298.tar.xz | |
* src/c99-to-c89.diff: Adjust seq.c offsets. Accommodate a new C99-ism.
Diffstat (limited to 'src')
| -rw-r--r-- | src/c99-to-c89.diff | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff index 9dfa1e8cc..79ac4e64f 100644 --- a/src/c99-to-c89.diff +++ b/src/c99-to-c89.diff @@ -108,7 +108,7 @@ diff -upr src/seq.c src/seq.c } return ret; -@@ -311,6 +313,7 @@ get_default_format (operand first, opera +@@ -338,6 +340,7 @@ get_default_format (operand first, opera size_t last_width = last.width + (prec - last.precision); if (last.precision && prec == 0) last_width--; /* don't include space for '.' */ @@ -116,7 +116,7 @@ diff -upr src/seq.c src/seq.c size_t width = MAX (first_width, last_width); if (width <= INT_MAX) { -@@ -318,6 +321,7 @@ get_default_format (operand first, opera +@@ -345,6 +348,7 @@ get_default_format (operand first, opera sprintf (format_buf, "%%0%d.%dLf", w, prec); return format_buf; } @@ -124,6 +124,22 @@ diff -upr src/seq.c src/seq.c } else { +@@ -433,6 +437,7 @@ main (int argc, char **argv) + if (format_str) + { + validate_format (format_str); ++ { + char const *f = long_double_format (format_str, &layout); + if (! f) + { +@@ -440,6 +445,7 @@ main (int argc, char **argv) + usage (EXIT_FAILURE); + } + format_str = f; ++ } + } + + last = scan_arg (argv[optind++]); diff -upr src/shred.c src/shred.c --- src/shred.c 2007-07-23 12:56:20.000000000 +0200 +++ src/shred.c 2007-07-23 13:03:12.000000000 +0200 @@ -136,3 +152,5 @@ diff -upr src/shred.c src/shred.c if (errnum == EIO && 0 <= size && (soff | SECTOR_MASK) < lim) { size_t soff1 = (soff | SECTOR_MASK) + 1; +--- src/seq.c 2008-02-18 22:53:29.000000000 +0100 ++++ src-c89/seq.c 2008-02-18 23:16:35.000000000 +0100 |