projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments from 2006-04-27.
[gnulib.git]
/
lib
/
long-options.c
diff --git
a/lib/long-options.c
b/lib/long-options.c
index
ada070e
..
7c9972a
100644
(file)
--- a/
lib/long-options.c
+++ b/
lib/long-options.c
@@
-1,6
+1,6
@@
/* Utility to accept --help and --version options as unobtrusively as possible.
/* Utility to accept --help and --version options as unobtrusively as possible.
- Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003 Free
+ Copyright (C) 1993, 1994, 1998, 1999, 2000, 2002, 2003
, 2004, 2005
Free
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-15,11
+15,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
+#if
def
HAVE_CONFIG_H
# include <config.h>
#endif
# include <config.h>
#endif
@@
-35,9
+35,9
@@
static struct option const long_options[] =
{
static struct option const long_options[] =
{
- {"help", no_argument,
0
, 'h'},
- {"version", no_argument,
0
, 'v'},
- {
0, 0, 0
, 0}
+ {"help", no_argument,
NULL
, 'h'},
+ {"version", no_argument,
NULL
, 'v'},
+ {
NULL, 0, NULL
, 0}
};
/* Process long options --help and --version, but only if argc == 2.
};
/* Process long options --help and --version, but only if argc == 2.
@@
-49,7
+49,7
@@
parse_long_options (int argc,
const char *command_name,
const char *package,
const char *version,
const char *command_name,
const char *package,
const char *version,
- void (*usage_func)
(
),
+ void (*usage_func)
(int
),
/* const char *author1, ...*/ ...)
{
int c;
/* const char *author1, ...*/ ...)
{
int c;
@@
-66,7
+66,7
@@
parse_long_options (int argc,
switch (c)
{
case 'h':
switch (c)
{
case 'h':
- (*usage_func) (
0
);
+ (*usage_func) (
EXIT_SUCCESS
);
case 'v':
{
case 'v':
{