diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2012-11-20 11:06:46 +0100 |
|---|---|---|
| committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2012-11-20 11:06:46 +0100 |
| commit | 8041e6b62cc829fe6442003fc5be636771a569a1 (patch) | |
| tree | eff21392528488eaf759c0665bce5fbb986ac1b6 | |
| parent | df062312bfceab5cb5935926a5d6b87374d9cce7 (diff) | |
| download | coreutils-8041e6b62cc829fe6442003fc5be636771a569a1.tar.xz | |
nl: remove deprecated --page-increment option
The above option has been deprecated since coreutils-7.5
by commit v7.4-129-g718b279.
* src/nl.c (PAGE_INCREMENT_OPTION_DEPRECATED): Remove enum.
(longopts): Remove "page-increment" entry.
(main): Remove PAGE_INCREMENT_OPTION_DEPRECATED case.
* NEWS (Changes in behavior): Mention the change.
Reported by Marcel Böhme in <http://bugs.gnu.org/12940>.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | src/nl.c | 11 |
2 files changed, 3 insertions, 11 deletions
@@ -25,6 +25,9 @@ GNU coreutils NEWS -*- outline -*- field can be in any column. If there is no source column, then df prints 'total' into the target column. + nl no longer supports the --page-increment option which was deprecated + since coreutils-7.5. Use --line-increment instead. + ** Build-related Perl is now more of a prerequisite. It has long been required in order @@ -145,11 +145,6 @@ static intmax_t line_no; /* True if we have ever read standard input. */ static bool have_read_stdin; -enum -{ - PAGE_INCREMENT_OPTION_DEPRECATED = CHAR_MAX + 1 -}; - static struct option const longopts[] = { {"header-numbering", required_argument, NULL, 'h'}, @@ -157,8 +152,6 @@ static struct option const longopts[] = {"footer-numbering", required_argument, NULL, 'f'}, {"starting-line-number", required_argument, NULL, 'v'}, {"line-increment", required_argument, NULL, 'i'}, - /* FIXME: page-increment is deprecated, remove in dec-2011. */ - {"page-increment", required_argument, NULL, PAGE_INCREMENT_OPTION_DEPRECATED}, {"no-renumber", no_argument, NULL, 'p'}, {"join-blank-lines", required_argument, NULL, 'l'}, {"number-separator", required_argument, NULL, 's'}, @@ -513,10 +506,6 @@ main (int argc, char **argv) ok = false; } break; - case PAGE_INCREMENT_OPTION_DEPRECATED: - error (0, 0, _("WARNING: --page-increment is deprecated; " - "use --line-increment instead")); - /* fall through */ case 'i': if (! (xstrtoimax (optarg, NULL, 10, &page_incr, "") == LONGINT_OK && 0 < page_incr)) |