pmccabe2html: escaping of special characters

[gnulib.git] / lib / xstrtol-error.c

diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 1d3d856..688cef7 100644 (file)
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -1,12 +1,12 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include "xstrtol.h"
@@ -46,9 +45,9 @@
 
 static void
 xstrtol_error (enum strtol_error err,
-              int opt_idx, char c, struct option const *long_options,
-              char const *arg,
-              int exit_status)
+               int opt_idx, char c, struct option const *long_options,
+               char const *arg,
+               int exit_status)
 {
   char const *hyphens = "--";
   char const *msgid;
@@ -61,16 +60,16 @@ xstrtol_error (enum strtol_error err,
       abort ();
 
     case LONGINT_INVALID:
-      msgid = N_("invalid %s%s argument `%s'");
+      msgid = N_("invalid %s%s argument '%s'");
       break;
 
     case LONGINT_INVALID_SUFFIX_CHAR:
     case LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW:
-      msgid = N_("invalid suffix in %s%s argument `%s'");
+      msgid = N_("invalid suffix in %s%s argument '%s'");
       break;
 
     case LONGINT_OVERFLOW:
-      msgid = N_("%s%s argument `%s' too large");
+      msgid = N_("%s%s argument '%s' too large");
       break;
     }
 
@@ -84,15 +83,15 @@ xstrtol_error (enum strtol_error err,
   else
     option = long_options[opt_idx].name;
 
-  error (exit_failure, 0, gettext (msgid), hyphens, option, arg);
+  error (exit_status, 0, gettext (msgid), hyphens, option, arg);
 }
 
 /* Like xstrtol_error, except exit with a failure status.  */
 
 void
 xstrtol_fatal (enum strtol_error err,
-              int opt_idx, char c, struct option const *long_options,
-              char const *arg)
+               int opt_idx, char c, struct option const *long_options,
+               char const *arg)
 {
   xstrtol_error (err, opt_idx, c, long_options, arg, exit_failure);
   abort ();