GNU bug report logs - #12940
Deprecated "nl --page-increment" to be removed

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 12940 in the body.
You can then email your comments to 12940 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Marcel Böhme" <hawkie <at> web.de>
To: bug-coreutils <at> gnu.org
Subject: Deprecated "nl --page-increment" to be removed
Date: Tue, 20 Nov 2012 09:42:37 +0100 (CET)

[Message part 1 (text/html, inline)]

Message #8 received at 12940 <at> debbugs.gnu.org (full text, mbox):

From: Bernhard Voelker <mail <at> bernhard-voelker.de>
To: Marcel Böhme <hawkie <at> web.de>
Cc: 12940 <at> debbugs.gnu.org
Subject: Re: bug#12940: Deprecated "nl --page-increment" to be removed
Date: Tue, 20 Nov 2012 10:58:37 +0100

tags 12940 + patch
severity 12940 minor
stop

On 11/20/2012 09:42 AM, Marcel Böhme wrote:
>    This is no bug per se. Apparently, the deprecated option
>    --page-increment for the tool "nl" has been scheduled to be removed on
>    Dec. 2011 :)

Hi Marcel,

thanks for the head-up.
Here's a patch.

BTW: Interestingly, there was no test-case for the -i option.
Well, tests/misc/nl.sh doesn't cover too much cases anyway.

Have a nice day,
Berny


From 31c86a3fe100ac68bf7fc34800bdd615c9e06e88 Mon Sep 17 00:00:00 2001
From: Bernhard Voelker <mail <at> bernhard-voelker.de>
Date: Tue, 20 Nov 2012 10:39:19 +0100
Subject: [PATCH] nl: remove deprecated --page-increment option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 (Remove deprecated options): Mention the change.

Reported by Marcel Böhme in <http://bugs.gnu.org/12940>.
---
 NEWS     |    5 +++++
 src/nl.c |   11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index e4a284c..df4b2e4 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,11 @@ GNU coreutils NEWS                                    -*- outline -*-
   field can be in any column.  If there is no source column, then df
   prints 'total' into the target column.

+** Remove deprecated options
+
+  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
diff --git a/src/nl.c b/src/nl.c
index 21d4c4d..9a1cdc1 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -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))
-- 
1.7.7

Message #11 received at 12940 <at> debbugs.gnu.org (full text, mbox):

From: Pádraig Brady <P <at> draigBrady.com>
To: Bernhard Voelker <mail <at> bernhard-voelker.de>
Cc: 12940 <at> debbugs.gnu.org, Marcel Böhme <hawkie <at> web.de>
Subject: Re: bug#12940: Deprecated "nl --page-increment" to be removed
Date: Tue, 20 Nov 2012 10:04:32 +0000

On 11/20/2012 09:58 AM, Bernhard Voelker wrote:
> diff --git a/NEWS b/NEWS
> index e4a284c..df4b2e4 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -25,6 +25,11 @@ GNU coreutils NEWS                                    -*- outline -*-
>     field can be in any column.  If there is no source column, then df
>     prints 'total' into the target column.
>
> +** Remove deprecated options

I prefer this item to be under "** Changes in behavior".

Other than that it looks good to push.

thanks!
Pádraig.

> +
> +  nl no longer supports the --page-increment option which was deprecated
> +  since coreutils-7.5.  Use --line-increment instead.
> +

Message #16 received at 12940-done <at> debbugs.gnu.org (full text, mbox):

From: Bernhard Voelker <mail <at> bernhard-voelker.de>
To: Pádraig Brady <P <at> draigBrady.com>
Cc: 12940-done <at> debbugs.gnu.org,
	Marcel Böhme <hawkie <at> web.de>
Subject: Re: bug#12940: Deprecated "nl --page-increment" to be removed
Date: Tue, 20 Nov 2012 11:11:11 +0100

On 11/20/2012 11:04 AM, Pádraig Brady wrote:
> On 11/20/2012 09:58 AM, Bernhard Voelker wrote:
>> diff --git a/NEWS b/NEWS
>> index e4a284c..df4b2e4 100644
>> --- a/NEWS
>> +++ b/NEWS
>> @@ -25,6 +25,11 @@ GNU coreutils NEWS                                    -*- outline -*-
>>     field can be in any column.  If there is no source column, then df
>>     prints 'total' into the target column.
>>
>> +** Remove deprecated options
> 
> I prefer this item to be under "** Changes in behavior".
> 
> Other than that it looks good to push.

Thanks for the review - pushed with the above change:
http://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commit;h=8041e6b62cc829fe6442003fc5be636771a569a1

Marking as done.

Have a nice day,
Berny

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.